diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-03-28 10:15:43 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-03-28 10:15:43 -0400 |
| commit | dc52b5bf2c94828fd3c8d26f4ca810d4ba53999a (patch) | |
| tree | d8bfc950911cbe40f541d0e424650598075fb8be /arch/arm/mach-pxa | |
| parent | 542f869f1826f092606efd0c4c771f070d1314f5 (diff) | |
| parent | d66ea8d4c2aa7199cf4e5c977eb25764e5fc5da9 (diff) | |
Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel
Diffstat (limited to 'arch/arm/mach-pxa')
| -rw-r--r-- | arch/arm/mach-pxa/colibri-pxa300.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-pxa/colibri-pxa320.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-pxa/colibri-pxa300.c b/arch/arm/mach-pxa/colibri-pxa300.c index 169ab552c21a..10c2eaf93230 100644 --- a/arch/arm/mach-pxa/colibri-pxa300.c +++ b/arch/arm/mach-pxa/colibri-pxa300.c | |||
| @@ -172,7 +172,7 @@ void __init colibri_pxa300_init(void) | |||
| 172 | colibri_pxa300_init_eth(); | 172 | colibri_pxa300_init_eth(); |
| 173 | colibri_pxa300_init_ohci(); | 173 | colibri_pxa300_init_ohci(); |
| 174 | colibri_pxa300_init_lcd(); | 174 | colibri_pxa300_init_lcd(); |
| 175 | colibri_pxa3xx_init_lcd(mfp_to_gpio(GPIO49_GPIO)); | 175 | colibri_pxa3xx_init_lcd(mfp_to_gpio(GPIO39_GPIO)); |
| 176 | colibri_pxa310_init_ac97(); | 176 | colibri_pxa310_init_ac97(); |
| 177 | colibri_pxa3xx_init_mmc(ARRAY_AND_SIZE(colibri_pxa300_mmc_pin_config), | 177 | colibri_pxa3xx_init_mmc(ARRAY_AND_SIZE(colibri_pxa300_mmc_pin_config), |
| 178 | mfp_to_gpio(MFP_PIN_GPIO13)); | 178 | mfp_to_gpio(MFP_PIN_GPIO13)); |
diff --git a/arch/arm/mach-pxa/colibri-pxa320.c b/arch/arm/mach-pxa/colibri-pxa320.c index 573a9a1dd529..55b74a7a6151 100644 --- a/arch/arm/mach-pxa/colibri-pxa320.c +++ b/arch/arm/mach-pxa/colibri-pxa320.c | |||
| @@ -169,7 +169,7 @@ void __init colibri_pxa320_init(void) | |||
| 169 | colibri_pxa320_init_eth(); | 169 | colibri_pxa320_init_eth(); |
| 170 | colibri_pxa320_init_ohci(); | 170 | colibri_pxa320_init_ohci(); |
| 171 | colibri_pxa320_init_lcd(); | 171 | colibri_pxa320_init_lcd(); |
| 172 | colibri_pxa3xx_init_lcd(mfp_to_gpio(GPIO39_GPIO)); | 172 | colibri_pxa3xx_init_lcd(mfp_to_gpio(GPIO49_GPIO)); |
| 173 | colibri_pxa320_init_ac97(); | 173 | colibri_pxa320_init_ac97(); |
| 174 | colibri_pxa3xx_init_mmc(ARRAY_AND_SIZE(colibri_pxa320_mmc_pin_config), | 174 | colibri_pxa3xx_init_mmc(ARRAY_AND_SIZE(colibri_pxa320_mmc_pin_config), |
| 175 | mfp_to_gpio(MFP_PIN_GPIO28)); | 175 | mfp_to_gpio(MFP_PIN_GPIO28)); |