* [PATCH 1/2] ARM: mach-shmobile: Correctly check for CONFIG_MACH_MACKEREL
@ 2011-04-04 6:45 Simon Horman
2011-04-04 8:07 ` Paul Mundt
0 siblings, 1 reply; 2+ messages in thread
From: Simon Horman @ 2011-04-04 6:45 UTC (permalink / raw)
To: linux-sh
I made a bit of a thinko when adding Mackerel to the boards
that support zboot using MMCIF.
Reported-by: Magnus Damm <magnus.damm@gmail.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
---
arch/arm/mach-shmobile/include/mach/mmc.h | 2 +-
arch/arm/mach-shmobile/include/mach/zboot.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-shmobile/include/mach/mmc.h b/arch/arm/mach-shmobile/include/mach/mmc.h
index e11560a..21a59db 100644
--- a/arch/arm/mach-shmobile/include/mach/mmc.h
+++ b/arch/arm/mach-shmobile/include/mach/mmc.h
@@ -9,7 +9,7 @@
#ifdef CONFIG_MACH_AP4EVB
#include "mach/mmc-ap4eb.h"
-#elif CONFIG_MACH_MACKEREL
+#elif defined(CONFIG_MACH_MACKEREL)
#include "mach/mmc-mackerel.h"
#else
#error "unsupported board."
diff --git a/arch/arm/mach-shmobile/include/mach/zboot.h b/arch/arm/mach-shmobile/include/mach/zboot.h
index 6d6a205..9320aff 100644
--- a/arch/arm/mach-shmobile/include/mach/zboot.h
+++ b/arch/arm/mach-shmobile/include/mach/zboot.h
@@ -13,7 +13,7 @@
#ifdef CONFIG_MACH_AP4EVB
#define MACH_TYPE MACH_TYPE_AP4EVB
#include "mach/head-ap4evb.txt"
-#elif CONFIG_MACH_MACKEREL
+#elif defined(CONFIG_MACH_MACKEREL)
#define MACH_TYPE MACH_TYPE_MACKEREL
#include "mach/head-mackerel.txt"
#else
--
1.7.4.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH 1/2] ARM: mach-shmobile: Correctly check for CONFIG_MACH_MACKEREL
2011-04-04 6:45 [PATCH 1/2] ARM: mach-shmobile: Correctly check for CONFIG_MACH_MACKEREL Simon Horman
@ 2011-04-04 8:07 ` Paul Mundt
0 siblings, 0 replies; 2+ messages in thread
From: Paul Mundt @ 2011-04-04 8:07 UTC (permalink / raw)
To: linux-sh
On Mon, Apr 04, 2011 at 03:45:21PM +0900, Simon Horman wrote:
> I made a bit of a thinko when adding Mackerel to the boards
> that support zboot using MMCIF.
>
> Reported-by: Magnus Damm <magnus.damm@gmail.com>
> Signed-off-by: Simon Horman <horms@verge.net.au>
This looks like an obvious fix, I'll queue it up, thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-04-04 8:07 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-04-04 6:45 [PATCH 1/2] ARM: mach-shmobile: Correctly check for CONFIG_MACH_MACKEREL Simon Horman
2011-04-04 8:07 ` Paul Mundt
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).