diff options
| author | Simon Horman <horms@verge.net.au> | 2011-04-04 06:45:21 +0000 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-04-06 11:08:20 -0700 |
| commit | 4a0f081d1b41cfe68df153d0bac7ad6baf226791 (patch) | |
| tree | 2fa390e23a797d1a8325bb7db15d33274588ffe2 /arch | |
| parent | 6221f222c0ebf1acdf7abcf927178f40e1a65e2a (diff) | |
| download | linux-3.10-4a0f081d1b41cfe68df153d0bac7ad6baf226791.tar.gz linux-3.10-4a0f081d1b41cfe68df153d0bac7ad6baf226791.tar.bz2 linux-3.10-4a0f081d1b41cfe68df153d0bac7ad6baf226791.zip | |
ARM: mach-shmobile: Correctly check for CONFIG_MACH_MACKEREL
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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-shmobile/include/mach/mmc.h | 2 | ||||
| -rw-r--r-- | 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 e11560a525a..21a59db638b 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 6d6a205bcf9..9320aff0a20 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 |