ARM: mach-shmobile: Correctly check for CONFIG_MACH_MACKEREL
authorSimon Horman <horms@verge.net.au>
Mon, 4 Apr 2011 06:45:21 +0000 (06:45 +0000)
committerPaul Mundt <lethal@linux-sh.org>
Wed, 6 Apr 2011 18:08:20 +0000 (11:08 -0700)
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>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
arch/arm/mach-shmobile/include/mach/mmc.h
arch/arm/mach-shmobile/include/mach/zboot.h

index e11560a525a1a11ac1efd3d1cb71a1545b7e8145..21a59db638bb0cde58592b0bb6d99036439f24f4 100644 (file)
@@ -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."
index 6d6a205bcf90091aec506b6cae8d0af2c2d09767..9320aff0a20f7521518291a101e6ff5710424ce8 100644 (file)
@@ -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