8 files changed, 23 insertions, 23 deletions

diff --git a/drivers/pcmcia/db1xxx_ss.c b/drivers/pcmcia/db1xxx_ss.c
index 01757f18a208..3e49df6d5e3b 100644
--- a/drivers/pcmcia/db1xxx_ss.c
+++ b/drivers/pcmcia/db1xxx_ss.c
@@ -24,6 +24,7 @@
 #include <linux/gpio.h>
 #include <linux/interrupt.h>
 #include <linux/pm.h>
+#include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/resource.h>
 #include <linux/slab.h>
diff --git a/drivers/pcmcia/pxa2xx_balloon3.c b/drivers/pcmcia/pxa2xx_balloon3.c
index f56d7de7c751..22a75e610f12 100644
--- a/drivers/pcmcia/pxa2xx_balloon3.c
+++ b/drivers/pcmcia/pxa2xx_balloon3.c
@@ -97,7 +97,7 @@ static void balloon3_pcmcia_socket_state(struct soc_pcmcia_socket *skt,
 static int balloon3_pcmcia_configure_socket(struct soc_pcmcia_socket *skt,
                                        const socket_state_t *state)
 {
-        __raw_writew(BALLOON3_CF_RESET, BALLOON3_CF_CONTROL_REG |
+        __raw_writew(BALLOON3_CF_RESET, BALLOON3_CF_CONTROL_REG +
                         ((state->flags & SS_RESET) ?
                         BALLOON3_FPGA_SETnCLR : 0));
         return 0;
diff --git a/drivers/pcmcia/pxa2xx_base.c b/drivers/pcmcia/pxa2xx_base.c
index 2c540542b5af..a87e2728b2c3 100644
--- a/drivers/pcmcia/pxa2xx_base.c
+++ b/drivers/pcmcia/pxa2xx_base.c
@@ -231,6 +231,7 @@ void pxa2xx_configure_sockets(struct device *dev)
 
         __raw_writel(mecr, MECR);
 }
+EXPORT_SYMBOL(pxa2xx_configure_sockets);
 
 static const char *skt_names[] = {
         "PCMCIA socket 0",
diff --git a/drivers/pcmcia/pxa2xx_cm_x255.c b/drivers/pcmcia/pxa2xx_cm_x255.c
index 63f4d5211ed2..0b4f946cf13a 100644
--- a/drivers/pcmcia/pxa2xx_cm_x255.c
+++ b/drivers/pcmcia/pxa2xx_cm_x255.c
@@ -14,6 +14,7 @@
 #include <linux/irq.h>
 #include <linux/delay.h>
 #include <linux/gpio.h>
+#include <linux/export.h>
 
 #include <asm/mach-types.h>
 
diff --git a/drivers/pcmcia/pxa2xx_cm_x270.c b/drivers/pcmcia/pxa2xx_cm_x270.c
index 6ee42b4c3e68..923f315926ef 100644
--- a/drivers/pcmcia/pxa2xx_cm_x270.c
+++ b/drivers/pcmcia/pxa2xx_cm_x270.c
@@ -14,6 +14,7 @@
 #include <linux/irq.h>
 #include <linux/delay.h>
 #include <linux/gpio.h>
+#include <linux/export.h>
 
 #include <asm/mach-types.h>
 
diff --git a/drivers/pcmcia/pxa2xx_cm_x2xx.c b/drivers/pcmcia/pxa2xx_cm_x2xx.c
index 4f09506ad8d4..6e7dcfd22ede 100644
--- a/drivers/pcmcia/pxa2xx_cm_x2xx.c
+++ b/drivers/pcmcia/pxa2xx_cm_x2xx.c
@@ -12,9 +12,8 @@
 
 #include <linux/module.h>
 
-#include <asm/system.h>
 #include <asm/mach-types.h>
-#include <mach/system.h>
+#include <mach/hardware.h>
 
 int cmx255_pcmcia_init(void);
 int cmx270_pcmcia_init(void);
diff --git a/drivers/pcmcia/pxa2xx_vpac270.c b/drivers/pcmcia/pxa2xx_vpac270.c
index e956f659089a..66ab92cf3105 100644
--- a/drivers/pcmcia/pxa2xx_vpac270.c
+++ b/drivers/pcmcia/pxa2xx_vpac270.c
@@ -17,7 +17,7 @@
 
 #include <asm/mach-types.h>
 
-#include <mach/gpio.h>
+#include <asm/gpio.h>
 #include <mach/vpac270.h>
 
 #include "soc_common.h"
diff --git a/drivers/pcmcia/sa1100_simpad.c b/drivers/pcmcia/sa1100_simpad.c
index c998f7aaadbc..0fac9658b020 100644
--- a/drivers/pcmcia/sa1100_simpad.c
+++ b/drivers/pcmcia/sa1100_simpad.c
@@ -15,10 +15,6 @@
 #include <mach/simpad.h>
 #include "sa1100_generic.h"
  
-extern long get_cs3_shadow(void);
-extern void set_cs3_bit(int value); 
-extern void clear_cs3_bit(int value);
-
 static struct pcmcia_irqs irqs[] = {
         { 1, IRQ_GPIO_CF_CD, "CF_CD" },
 };
@@ -26,7 +22,7 @@ static struct pcmcia_irqs irqs[] = {
 static int simpad_pcmcia_hw_init(struct soc_pcmcia_socket *skt)
 {
 
-        clear_cs3_bit(VCC_3V_EN|VCC_5V_EN|EN0|EN1);
+        simpad_clear_cs3_bit(VCC_3V_EN|VCC_5V_EN|EN0|EN1);
 
         skt->socket.pci_irq = IRQ_GPIO_CF_IRQ;
 
@@ -38,8 +34,8 @@ static void simpad_pcmcia_hw_shutdown(struct soc_pcmcia_socket *skt)
         soc_pcmcia_free_irqs(skt, irqs, ARRAY_SIZE(irqs));
 
         /* Disable CF bus: */
-        //set_cs3_bit(PCMCIA_BUFF_DIS);
-        clear_cs3_bit(PCMCIA_RESET);       
+        /*simpad_set_cs3_bit(PCMCIA_BUFF_DIS);*/
+        simpad_clear_cs3_bit(PCMCIA_RESET);
 }
 
 static void
@@ -47,15 +43,16 @@ simpad_pcmcia_socket_state(struct soc_pcmcia_socket *skt,
                            struct pcmcia_state *state)
 {
         unsigned long levels = GPLR;
-        long cs3reg = get_cs3_shadow();
+        long cs3reg = simpad_get_cs3_ro();
 
         state->detect=((levels & GPIO_CF_CD)==0)?1:0;
         state->ready=(levels & GPIO_CF_IRQ)?1:0;
-        state->bvd1=1; /* Not available on Simpad. */
-        state->bvd2=1; /* Not available on Simpad. */
+        state->bvd1 = 1; /* Might be cs3reg & PCMCIA_BVD1 */
+        state->bvd2 = 1; /* Might be cs3reg & PCMCIA_BVD2 */
         state->wrprot=0; /* Not available on Simpad. */
-  
-        if((cs3reg & 0x0c) == 0x0c) {
+
+        if ((cs3reg & (PCMCIA_VS1|PCMCIA_VS2)) ==
+                        (PCMCIA_VS1|PCMCIA_VS2)) {
                 state->vs_3v=0;
                 state->vs_Xv=0;
         } else {
@@ -75,23 +72,23 @@ simpad_pcmcia_configure_socket(struct soc_pcmcia_socket *skt,
         /* Murphy: see table of MIC2562a-1 */
         switch (state->Vcc) {
         case 0:
-                clear_cs3_bit(VCC_3V_EN|VCC_5V_EN|EN0|EN1);
+                simpad_clear_cs3_bit(VCC_3V_EN|VCC_5V_EN|EN0|EN1);
                 break;
 
         case 33:  
-                clear_cs3_bit(VCC_3V_EN|EN1);
-                set_cs3_bit(VCC_5V_EN|EN0);
+                simpad_clear_cs3_bit(VCC_3V_EN|EN1);
+                simpad_set_cs3_bit(VCC_5V_EN|EN0);
                 break;
 
         case 50:
-                clear_cs3_bit(VCC_5V_EN|EN1);
-                set_cs3_bit(VCC_3V_EN|EN0);
+                simpad_clear_cs3_bit(VCC_5V_EN|EN1);
+                simpad_set_cs3_bit(VCC_3V_EN|EN0);
                 break;
 
         default:
                 printk(KERN_ERR "%s(): unrecognized Vcc %u\n",
                         __func__, state->Vcc);
-                clear_cs3_bit(VCC_3V_EN|VCC_5V_EN|EN0|EN1);
+                simpad_clear_cs3_bit(VCC_3V_EN|VCC_5V_EN|EN0|EN1);
                 local_irq_restore(flags);
                 return -1;
         }
@@ -110,7 +107,7 @@ static void simpad_pcmcia_socket_init(struct soc_pcmcia_socket *skt)
 static void simpad_pcmcia_socket_suspend(struct soc_pcmcia_socket *skt)
 {
         soc_pcmcia_disable_irqs(skt, irqs, ARRAY_SIZE(irqs));
-        set_cs3_bit(PCMCIA_RESET);
+        simpad_set_cs3_bit(PCMCIA_RESET);
 }
 
 static struct pcmcia_low_level simpad_pcmcia_ops = {