5 files changed, 9 insertions, 7 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
diff --git a/drivers/pcmcia/pxa2xx_base.c b/drivers/pcmcia/pxa2xx_base.c
index 16f84aab6ab3..c49a7269f6d1 100644
--- a/drivers/pcmcia/pxa2xx_base.c
+++ b/drivers/pcmcia/pxa2xx_base.c
@@ -214,7 +214,7 @@ static void pxa2xx_configure_sockets(struct device *dev)
         MECR |= MECR_CIT;
 
         /* Set MECR:NOS (Number Of Sockets) */
-        if (ops->nr > 1 || machine_is_viper())
+        if ((ops->first + ops->nr) > 1 || machine_is_viper())
                 MECR |= MECR_NOS;
         else
                 MECR &= ~MECR_NOS;
@@ -250,7 +250,7 @@ int __pxa2xx_drv_pcmcia_probe(struct device *dev)
         for (i = 0; i < ops->nr; i++) {
                 skt = &sinfo->skt[i];
 
-                skt->nr         = i;
+                skt->nr         = ops->first + i;
                 skt->irq        = NO_IRQ;
 
                 skt->res_skt.start      = _PCMCIA(skt->nr);
diff --git a/drivers/pcmcia/pxa2xx_palmld.c b/drivers/pcmcia/pxa2xx_palmld.c
index 1736c67e547e..5ba9b3664a00 100644
--- a/drivers/pcmcia/pxa2xx_palmld.c
+++ b/drivers/pcmcia/pxa2xx_palmld.c
@@ -98,8 +98,8 @@ static void palmld_pcmcia_socket_suspend(struct soc_pcmcia_socket *skt)
 static struct pcmcia_low_level palmld_pcmcia_ops = {
         .owner                  = THIS_MODULE,
 
-        .first                  = 0,
-        .nr                     = 2,
+        .first                  = 1,
+        .nr                     = 1,
 
         .hw_init                = palmld_pcmcia_hw_init,
         .hw_shutdown            = palmld_pcmcia_hw_shutdown,