Merge branch 'platforms' of git://git.linaro.org/people/rmk/linux-arm
[linux-2.6.git] / drivers / pcmcia / cs_internal.h
index 37d38b5..7f1953f 100644 (file)
 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;
 
 
@@ -62,7 +53,8 @@ struct pccard_resource_ops {
                                         unsigned int attr,
                                         unsigned int *base,
                                         unsigned int num,
-                                        unsigned int align);
+                                        unsigned int align,
+                                        struct resource **parent);
        struct resource* (*find_mem)    (unsigned long base, unsigned long num,
                                         unsigned long align, int low,
                                         struct pcmcia_socket *s);