Merge branch 'master' into tk71

[mv-sheeva.git] / drivers / char / pcmcia / ipwireless / main.h

diff --git a/drivers/char/pcmcia/ipwireless/main.h b/drivers/char/pcmcia/ipwireless/main.h
index c207be87b597fe3cecfec61da71d8fdf3386b36f..f2cbb116bccb51d2c3c548cf5053b782fb84f9de 100644 (file)
--- a/drivers/char/pcmcia/ipwireless/main.h
+++ b/drivers/char/pcmcia/ipwireless/main.h
@@ -21,7 +21,6 @@
 #include <linux/sched.h>
 #include <linux/types.h>
 
-#include <pcmcia/cs.h>
 #include <pcmcia/cistpl.h>
 #include <pcmcia/ds.h>
 
@@ -45,13 +44,9 @@ struct ipw_dev {
        struct pcmcia_device *link;
        int is_v2_card;
 
-       window_handle_t handle_attr_memory;
        void __iomem *attr_memory;
-       win_req_t request_attr_memory;
 
-       window_handle_t handle_common_memory;
        void __iomem *common_memory;
-       win_req_t request_common_memory;
 
        /* Reference to attribute memory, containing CIS data */
        void *attribute_memory;