diff options
author | Arnd Bergmann <arnd@arndb.de> | 2011-10-30 21:26:37 +0100 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-30 21:26:37 +0100 |
commit | 91fed558d0f33c74477569f50ed883fe6d430f1f (patch) | |
tree | 84b32eb5f9b995efc21e39ee241fed38372d5f3b /arch/arm/mach-pxa/include/mach/zylonite.h | |
parent | db1c5628eb8a321af7585e58019de99ccd2f28b2 (diff) | |
parent | 1a64200ec5e93be03e27c3b2fc332e04ae443eb2 (diff) |
Merge branch 'pxa/fixes' into next/fixes
Diffstat (limited to 'arch/arm/mach-pxa/include/mach/zylonite.h')
-rw-r--r-- | arch/arm/mach-pxa/include/mach/zylonite.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-pxa/include/mach/zylonite.h b/arch/arm/mach-pxa/include/mach/zylonite.h index ea24998b923..ecca976f03d 100644 --- a/arch/arm/mach-pxa/include/mach/zylonite.h +++ b/arch/arm/mach-pxa/include/mach/zylonite.h @@ -19,7 +19,7 @@ extern int wm9713_irq; extern int lcd_id; extern int lcd_orientation; -#ifdef CONFIG_CPU_PXA300 +#ifdef CONFIG_MACH_ZYLONITE300 extern void zylonite_pxa300_init(void); #else static inline void zylonite_pxa300_init(void) @@ -29,7 +29,7 @@ static inline void zylonite_pxa300_init(void) } #endif -#ifdef CONFIG_CPU_PXA320 +#ifdef CONFIG_MACH_ZYLONITE320 extern void zylonite_pxa320_init(void); #else static inline void zylonite_pxa320_init(void) |