diff options
Diffstat (limited to 'include/pcmcia/ds.h')
-rw-r--r-- | include/pcmcia/ds.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/include/pcmcia/ds.h b/include/pcmcia/ds.h index 312fd958c901..c267edde9d0c 100644 --- a/include/pcmcia/ds.h +++ b/include/pcmcia/ds.h | |||
@@ -18,6 +18,8 @@ | |||
18 | 18 | ||
19 | #include <pcmcia/bulkmem.h> | 19 | #include <pcmcia/bulkmem.h> |
20 | #include <pcmcia/cs_types.h> | 20 | #include <pcmcia/cs_types.h> |
21 | #include <pcmcia/device_id.h> | ||
22 | #include <linux/mod_devicetable.h> | ||
21 | 23 | ||
22 | typedef struct tuple_parse_t { | 24 | typedef struct tuple_parse_t { |
23 | tuple_t tuple; | 25 | tuple_t tuple; |
@@ -135,6 +137,7 @@ struct pcmcia_driver { | |||
135 | dev_link_t *(*attach)(void); | 137 | dev_link_t *(*attach)(void); |
136 | void (*detach)(dev_link_t *); | 138 | void (*detach)(dev_link_t *); |
137 | struct module *owner; | 139 | struct module *owner; |
140 | struct pcmcia_device_id *id_table; | ||
138 | struct device_driver drv; | 141 | struct device_driver drv; |
139 | }; | 142 | }; |
140 | 143 | ||
@@ -173,7 +176,9 @@ struct pcmcia_device { | |||
173 | u8 has_manf_id:1; | 176 | u8 has_manf_id:1; |
174 | u8 has_card_id:1; | 177 | u8 has_card_id:1; |
175 | u8 has_func_id:1; | 178 | u8 has_func_id:1; |
176 | u8 reserved:5; | 179 | |
180 | u8 allow_func_id_match:1; | ||
181 | u8 reserved:4; | ||
177 | 182 | ||
178 | u8 func_id; | 183 | u8 func_id; |
179 | u16 manf_id; | 184 | u16 manf_id; |