From ec13592060ed809c5d6af50f2fcc0b4cc18e3f77 Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Sat, 1 Oct 2011 22:03:37 +0200 Subject: 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 Signed-off-by: Eric Miao --- arch/arm/mach-pxa/include/mach/zylonite.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'arch/arm/mach-pxa') diff --git a/arch/arm/mach-pxa/include/mach/zylonite.h b/arch/arm/mach-pxa/include/mach/zylonite.h index ea24998..ecca976 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) -- cgit v1.1