[ARM PATCH] 1492/1: [BADGE4] Make PCMCIA work in 2.5.65-rmk1 fro BadgePAD 4

Patch from Christopher Hoover

diff --git a/drivers/pcmcia/sa1100_badge4.c b/drivers/pcmcia/sa1100_badge4.c
index bbc5bdffea0f0c23e66a33e59389e6163679ce3d..1220c09b804a794e75ee5032fc73c237b65d036c 100644 (file)
--- a/drivers/pcmcia/sa1100_badge4.c
+++ b/drivers/pcmcia/sa1100_badge4.c
@@ -140,7 +140,7 @@ badge4_pcmcia_configure_socket(int sock, const struct pcmcia_configure *conf)
 
                need5V = ((conf->vcc == 50) || (conf->vpp == 50));
 
-               badge4_set_5V(BADGE4_5V_PCMCIA_SOCK(conf->sock), need5V);
+               badge4_set_5V(BADGE4_5V_PCMCIA_SOCK(sock), need5V);
 
                local_irq_restore(flags);
        }

diff --git a/drivers/pcmcia/sa1111_generic.h b/drivers/pcmcia/sa1111_generic.h
index 459d7b1145cd4e1ba4ef631af0345eaaf4aee667..ea9a981469b8dafa1f4f82d75568c0d33c7d5aec 100644 (file)
--- a/drivers/pcmcia/sa1111_generic.h
+++ b/drivers/pcmcia/sa1111_generic.h
@@ -6,9 +6,13 @@ extern int sa1111_pcmcia_socket_init(int);
 extern int sa1111_pcmcia_socket_suspend(int);
 
 
+extern int pcmcia_badge4_init(struct device *);
+extern void pcmcia_badge4_exit(struct device *);
+
 extern int pcmcia_jornada720_init(struct device *);
 extern void pcmcia_jornada720_exit(struct device *);
 
 extern int pcmcia_neponset_init(struct device *);
 extern void pcmcia_neponset_exit(struct device *);
 
+