diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-07 12:49:01 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-07 12:49:01 -0700 |
| commit | 174457391a83d70215d441cb3bc0aa7d7443b63e (patch) | |
| tree | 14fc07f2aa07d993694fdfc757ebd0f82eb76397 /arch/arm/mach-shmobile/include/mach/zboot.h | |
| parent | 26cf445721763d61b08ce394f8bdbd4c5610b563 (diff) | |
| parent | 6084c81e8a8ffa8b85d59e1ca7643dc76c23e412 (diff) | |
Merge branch 'rmobile-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* 'rmobile-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
ARM: arch-shmobile: only run FSI init on respective boards
ARM: arch-shmobile: only run HDMI init on respective boards
ARM: mach-shmobile: Correctly check for CONFIG_MACH_MACKEREL
Diffstat (limited to 'arch/arm/mach-shmobile/include/mach/zboot.h')
| -rw-r--r-- | arch/arm/mach-shmobile/include/mach/zboot.h | 2 |
1 files changed, 1 insertions, 1 deletions
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 |