Remove unneeded function declarations and correct /proc-directory name for
> 1 pcmcia_socket_class devices.
Dominik
diff -ruN linux-original/drivers/pcmcia/cs.c linux-pcmcia/drivers/pcmcia/cs.c
--- linux-original/drivers/pcmcia/cs.c 2003-02-16 01:28:50.000000000 +0100
+++ linux-pcmcia/drivers/pcmcia/cs.c 2003-02-16 01:30:04.000000000 +0100
@@ -356,7 +356,7 @@
#ifdef CONFIG_PROC_FS
if (proc_pccard) {
char name[3];
- sprintf(name, "%02d", i);
+ sprintf(name, "%02d", j);
s->proc = proc_mkdir(name, proc_pccard);
if (s->proc)
s->ss_entry->proc_setup(i, s->proc);
diff -ruN linux-original/drivers/pcmcia/pci_socket.c linux-pcmcia/drivers/pcmcia/pci_socket.c
--- linux-original/drivers/pcmcia/pci_socket.c 2003-02-16 01:28:50.000000000 +0100
+++ linux-pcmcia/drivers/pcmcia/pci_socket.c 2003-02-16 01:28:16.000000000 +0100
@@ -31,9 +31,6 @@
#include "pci_socket.h"
-extern struct socket_info_t *pcmcia_register_socket (int slot,
- struct pccard_operations *vtable, int use_bus_pm);
-extern void pcmcia_unregister_socket (struct socket_info_t *socket);
extern void pcmcia_suspend_socket (struct socket_info_t *socket);
extern void pcmcia_resume_socket (struct socket_info_t *socket);