Commit a75568c6 authored by Linus Torvalds's avatar Linus Torvalds

Fix parport_cs compile troubles

parent 50b1b006
...@@ -45,6 +45,7 @@ ...@@ -45,6 +45,7 @@
#include <linux/string.h> #include <linux/string.h>
#include <linux/timer.h> #include <linux/timer.h>
#include <linux/ioport.h> #include <linux/ioport.h>
#include <linux/major.h>
#include <linux/parport.h> #include <linux/parport.h>
#include <linux/parport_pc.h> #include <linux/parport_pc.h>
...@@ -106,7 +107,6 @@ static dev_info_t dev_info = "parport_cs"; ...@@ -106,7 +107,6 @@ static dev_info_t dev_info = "parport_cs";
static dev_link_t *dev_list = NULL; static dev_link_t *dev_list = NULL;
extern struct parport_operations parport_pc_ops; extern struct parport_operations parport_pc_ops;
static struct parport_operations parport_cs_ops;
/*====================================================================*/ /*====================================================================*/
...@@ -459,13 +459,6 @@ static int __init init_parport_cs(void) ...@@ -459,13 +459,6 @@ static int __init init_parport_cs(void)
return -1; return -1;
} }
#if (LINUX_VERSION_CODE < VERSION(2,3,6))
/* This is to protect against unloading modules out of order */
parport_cs_ops = parport_pc_ops;
parport_cs_ops.inc_use_count = &inc_use_count;
parport_cs_ops.dec_use_count = &dec_use_count;
#endif
register_pccard_driver(&dev_info, &parport_attach, &parport_detach); register_pccard_driver(&dev_info, &parport_attach, &parport_detach);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment