pcmcia: convert pcmcia_request_configuration to pcmcia_enable_device
[linux-2.6.git] / include / pcmcia / ss.h
index 66740b7..731cde0 100644 (file)
@@ -19,8 +19,6 @@
 #include <linux/sched.h>       /* task_struct, completion */
 #include <linux/mutex.h>
 
-#include <pcmcia/cs_types.h>
-#include <pcmcia/cs.h>
 #ifdef CONFIG_CARDBUS
 #include <linux/pci.h>
 #endif
@@ -162,17 +160,10 @@ struct pcmcia_socket {
        u_int                           pci_irq;
        struct pci_dev                  *cb_dev;
 
-
        /* socket setup is done so resources should be able to be allocated.
         * Only if set to 1, calls to find_{io,mem}_region are handled, and
         * insertio events are actually managed by the PCMCIA layer.*/
-       u8                              resource_setup_done:1;
-
-       /* It's old if resource setup is done using adjust_resource_info() */
-       u8                              resource_setup_old:1;
-       u8                              resource_setup_new:1;
-
-       u8                              reserved:5;
+       u8                              resource_setup_done;
 
        /* socket operations */
        struct pccard_operations        *ops;
@@ -218,13 +209,8 @@ struct pcmcia_socket {
         * incorrectness and change */
        u8                              device_count;
 
-       /* 16-bit state: */
-       struct {
-               /* the PCMCIA card consists of two pseudo devices */
-               u8                      has_pfc:1;
-
-               u8                      reserved:7;
-       } pcmcia_state;
+       /* does the PCMCIA card consist of two pseudo devices? */
+       u8                              pcmcia_pfc;
 
        /* non-zero if PCMCIA card is present */
        atomic_t                        present;