From d89ad982e77e72d5e835aab36798f94df3fb2e4c Mon Sep 17 00:00:00 2001 From: Daniel Mack Date: Fri, 27 Mar 2009 22:00:09 +0100 Subject: [PATCH] --- yaml --- r: 137539 b: refs/heads/master c: c9b78189f50dcba6e69080268873a62c67e4bc15 h: refs/heads/master i: 137537: 77f1f2dfcf7579fccc87a0e8390c94889107488a 137535: 491e6bdbc28298bc5021d805f40427f5b301c2ba v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-pxa/colibri-pxa300.c | 2 +- trunk/arch/arm/mach-pxa/colibri-pxa320.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 9ab671d382cf..d27ae4b836d6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 707b2c247c6c3e8976f94fcf9ab25c85502352d5 +refs/heads/master: c9b78189f50dcba6e69080268873a62c67e4bc15 diff --git a/trunk/arch/arm/mach-pxa/colibri-pxa300.c b/trunk/arch/arm/mach-pxa/colibri-pxa300.c index 169ab552c21a..10c2eaf93230 100644 --- a/trunk/arch/arm/mach-pxa/colibri-pxa300.c +++ b/trunk/arch/arm/mach-pxa/colibri-pxa300.c @@ -172,7 +172,7 @@ void __init colibri_pxa300_init(void) colibri_pxa300_init_eth(); colibri_pxa300_init_ohci(); colibri_pxa300_init_lcd(); - colibri_pxa3xx_init_lcd(mfp_to_gpio(GPIO49_GPIO)); + colibri_pxa3xx_init_lcd(mfp_to_gpio(GPIO39_GPIO)); colibri_pxa310_init_ac97(); colibri_pxa3xx_init_mmc(ARRAY_AND_SIZE(colibri_pxa300_mmc_pin_config), mfp_to_gpio(MFP_PIN_GPIO13)); diff --git a/trunk/arch/arm/mach-pxa/colibri-pxa320.c b/trunk/arch/arm/mach-pxa/colibri-pxa320.c index 573a9a1dd529..55b74a7a6151 100644 --- a/trunk/arch/arm/mach-pxa/colibri-pxa320.c +++ b/trunk/arch/arm/mach-pxa/colibri-pxa320.c @@ -169,7 +169,7 @@ void __init colibri_pxa320_init(void) colibri_pxa320_init_eth(); colibri_pxa320_init_ohci(); colibri_pxa320_init_lcd(); - colibri_pxa3xx_init_lcd(mfp_to_gpio(GPIO39_GPIO)); + colibri_pxa3xx_init_lcd(mfp_to_gpio(GPIO49_GPIO)); colibri_pxa320_init_ac97(); colibri_pxa3xx_init_mmc(ARRAY_AND_SIZE(colibri_pxa320_mmc_pin_config), mfp_to_gpio(MFP_PIN_GPIO28));