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

Patch from Christopher Hoover

[ARM PATCH] 1492/1: [BADGE4] Make PCMCIA work in 2.5.65-rmk1 fro BadgePAD 4
Patch from Christopher Hoover
f2d2e565 · Christopher Hoover · Russell King · 401cba0e · f2d2e565 · f2d2e565
Commit f2d2e565 authored Apr 07, 2003 by Christopher Hoover Committed by Russell King Apr 07, 2003
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

drivers/pcmcia/sa1100_badge4.c drivers/pcmcia/sa1100_badge4.c +1 -1

drivers/pcmcia/sa1111_generic.h drivers/pcmcia/sa1111_generic.h +4 -0

No files found.
--- 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);
 	}

--- 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 *);