Merge tag 'v2.6.37' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / pcmcia / cs_internal.h

diff --git a/drivers/pcmcia/cs_internal.h b/drivers/pcmcia/cs_internal.h
index da055dc14d98a2933953e206d9544d33cc74cb17..7f1953f78b12b906421a4c8f130d4094e49c6d74 100644 (file)
--- a/drivers/pcmcia/cs_internal.h
+++ b/drivers/pcmcia/cs_internal.h
@@ -33,18 +33,9 @@
 typedef struct config_t {
        struct kref     ref;
        unsigned int    state;
-       unsigned int    Attributes;
-       unsigned int    IntType;
-       unsigned int    ConfigBase;
-       unsigned char   Status, Pin, Copy, Option, ExtStatus;
-       unsigned int    CardValues;
 
        struct resource io[MAX_IO_WIN]; /* io ports */
        struct resource mem[MAX_WIN];   /* mem areas */
-
-       struct {
-               u_int   Attributes;
-       } irq;
 } config_t;