Skip to content

Commit

Permalink
ARM: pxa: make zylonite_pxa*_init declaration match code
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Arnd Bergmann authored and Eric Miao committed Oct 8, 2011
1 parent ba4a90a commit ec13592
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions arch/arm/mach-pxa/include/mach/zylonite.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand Down

0 comments on commit ec13592

Please sign in to comment.