diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-04-15 09:58:21 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-04-15 09:58:21 +0100 |
| commit | 9fa264d0d327a67db4913b400bcfb174d929054c (patch) | |
| tree | ec2ba2b7d6d9c32e7bdb2d2aa8c61bfe48546664 /arch/arm/mach-pxa/include/mach/colibri.h | |
| parent | 0882e8dd3aad33eca41696d463bb896e6c8817eb (diff) | |
| parent | 6845a658e09767e72c12558825ed66a9eda02737 (diff) | |
| download | op-kernel-dev-9fa264d0d327a67db4913b400bcfb174d929054c.zip op-kernel-dev-9fa264d0d327a67db4913b400bcfb174d929054c.tar.gz | |
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
Diffstat (limited to 'arch/arm/mach-pxa/include/mach/colibri.h')
| -rw-r--r-- | arch/arm/mach-pxa/include/mach/colibri.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-pxa/include/mach/colibri.h b/arch/arm/mach-pxa/include/mach/colibri.h index 90230c6..a88d7ca 100644 --- a/arch/arm/mach-pxa/include/mach/colibri.h +++ b/arch/arm/mach-pxa/include/mach/colibri.h @@ -10,13 +10,13 @@ #if defined(CONFIG_MMC_PXA) || defined(CONFIG_MMC_PXA_MODULE) extern void colibri_pxa3xx_init_mmc(mfp_cfg_t *pins, int len, int detect_pin); #else -static inline void colibri_pxa3xx_init_mmc(mfp_cfg_t *, int, int) {} +static inline void colibri_pxa3xx_init_mmc(mfp_cfg_t *pins, int len, int detect_pin) {} #endif #if defined(CONFIG_FB_PXA) || defined(CONFIG_FB_PXA_MODULE) extern void colibri_pxa3xx_init_lcd(int bl_pin); #else -static inline void colibri_pxa3xx_init_lcd(int) {} +static inline void colibri_pxa3xx_init_lcd(int bl_pin) {} #endif #if defined(CONFIG_AX88796) |
