summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2011-10-01 22:03:37 +0200
committerEric Miao <eric.y.miao@gmail.com>2011-10-08 15:02:57 +0200
commitec13592060ed809c5d6af50f2fcc0b4cc18e3f77 (patch)
treeb3a0c8b22e34fc7e5402b6a1685c7386bd95521f /arch/arm/mach-pxa
parentARM: pxa/z2: fix building error of pxa27x_cpu_suspend() no longer available (diff)
downloadlinux-ec13592060ed809c5d6af50f2fcc0b4cc18e3f77.tar.xz
linux-ec13592060ed809c5d6af50f2fcc0b4cc18e3f77.zip
ARM: pxa: make zylonite_pxa*_init declaration match code
When support for zylonite is disabled, the zylonite_pxa300_init and zylonite_pxa320_init functions are not there, but the declaration is still kept around if any other boards for the same soc are enabled. This changes the declaration to be conditional on the same symbol as the code. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
Diffstat (limited to 'arch/arm/mach-pxa')
-rw-r--r--arch/arm/mach-pxa/include/mach/zylonite.h4
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 ea24998b923c..ecca976f03d2 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)