Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel

3 files changed, 5 insertions, 3 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)
         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/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)
         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));
diff --git a/arch/arm/plat-pxa/Makefile b/arch/arm/plat-pxa/Makefile
index 4be37235f57b..8f2c4c7fbd48 100644
--- a/arch/arm/plat-pxa/Makefile
+++ b/arch/arm/plat-pxa/Makefile
@@ -2,6 +2,8 @@
 # Makefile for code common across different PXA processor families
 #
 
-obj-y   := dma.o mfp.o
+obj-y   := dma.o
 
 obj-$(CONFIG_GENERIC_GPIO)      += gpio.o
+obj-$(CONFIG_PXA3xx)            += mfp.o
+obj-$(CONFIG_ARCH_MMP)          += mfp.o