Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6

1 files changed, 1 insertions, 10 deletions

diff --git a/drivers/net/wireless/wavelan_cs.p.h b/drivers/net/wireless/wavelan_cs.p.h
index 724a715089c9..f2d597568151 100644
--- a/drivers/net/wireless/wavelan_cs.p.h
+++ b/drivers/net/wireless/wavelan_cs.p.h
@@ -754,20 +754,11 @@ static void
 static int
         wavelan_open(struct net_device *),              /* Open the device */
         wavelan_close(struct net_device *);     /* Close the device */
-static dev_link_t *
-        wavelan_attach(void);           /* Create a new device */
 static void
-        wavelan_detach(dev_link_t *);   /* Destroy a removed device */
-static int
-        wavelan_event(event_t,          /* Manage pcmcia events */
-                      int,
-                      event_callback_args_t *);
+        wavelan_detach(struct pcmcia_device *p_dev);    /* Destroy a removed device */
 
 /**************************** VARIABLES ****************************/
 
-static dev_info_t dev_info = "wavelan_cs";
-static dev_link_t *dev_list = NULL;     /* Linked list of devices */
-
 /*
  * Parameters that can be set with 'insmod'
  * The exact syntax is 'insmod wavelan_cs.o <var>=<value>'