diff options
Diffstat (limited to 'arch/arm/mach-pxa/include/mach/colibri.h')
-rw-r--r-- | arch/arm/mach-pxa/include/mach/colibri.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/arch/arm/mach-pxa/include/mach/colibri.h b/arch/arm/mach-pxa/include/mach/colibri.h index 3f2a01d6a03c..a88d7caff0d1 100644 --- a/arch/arm/mach-pxa/include/mach/colibri.h +++ b/arch/arm/mach-pxa/include/mach/colibri.h | |||
@@ -1,5 +1,8 @@ | |||
1 | #ifndef _COLIBRI_H_ | 1 | #ifndef _COLIBRI_H_ |
2 | #define _COLIBRI_H_ | 2 | #define _COLIBRI_H_ |
3 | |||
4 | #include <net/ax88796.h> | ||
5 | |||
3 | /* | 6 | /* |
4 | * common settings for all modules | 7 | * common settings for all modules |
5 | */ | 8 | */ |
@@ -7,13 +10,17 @@ | |||
7 | #if defined(CONFIG_MMC_PXA) || defined(CONFIG_MMC_PXA_MODULE) | 10 | #if defined(CONFIG_MMC_PXA) || defined(CONFIG_MMC_PXA_MODULE) |
8 | extern void colibri_pxa3xx_init_mmc(mfp_cfg_t *pins, int len, int detect_pin); | 11 | extern void colibri_pxa3xx_init_mmc(mfp_cfg_t *pins, int len, int detect_pin); |
9 | #else | 12 | #else |
10 | static inline void colibri_pxa3xx_init_mmc(mfp_cfg_t *, int, int) {} | 13 | static inline void colibri_pxa3xx_init_mmc(mfp_cfg_t *pins, int len, int detect_pin) {} |
11 | #endif | 14 | #endif |
12 | 15 | ||
13 | #if defined(CONFIG_FB_PXA) || defined(CONFIG_FB_PXA_MODULE) | 16 | #if defined(CONFIG_FB_PXA) || defined(CONFIG_FB_PXA_MODULE) |
14 | extern void colibri_pxa3xx_init_lcd(int bl_pin); | 17 | extern void colibri_pxa3xx_init_lcd(int bl_pin); |
15 | #else | 18 | #else |
16 | static inline void colibri_pxa3xx_init_lcd(int) {} | 19 | static inline void colibri_pxa3xx_init_lcd(int bl_pin) {} |
20 | #endif | ||
21 | |||
22 | #if defined(CONFIG_AX88796) | ||
23 | extern void colibri_pxa3xx_init_eth(struct ax_plat_data *plat_data); | ||
17 | #endif | 24 | #endif |
18 | 25 | ||
19 | /* physical memory regions */ | 26 | /* physical memory regions */ |