1 files changed, 6 insertions, 3 deletions

diff --git a/include/pcmcia/ds.h b/include/pcmcia/ds.h
index 312fd958c901..2b52553f2d94 100644
--- a/include/pcmcia/ds.h
+++ b/include/pcmcia/ds.h
@@ -18,6 +18,8 @@
 
 #include <pcmcia/bulkmem.h>
 #include <pcmcia/cs_types.h>
+#include <pcmcia/device_id.h>
+#include <linux/mod_devicetable.h>
 
 typedef struct tuple_parse_t {
     tuple_t             tuple;
@@ -129,12 +131,11 @@ typedef struct dev_link_t {
 
 struct pcmcia_socket;
 
-extern struct bus_type pcmcia_bus_type;
-
 struct pcmcia_driver {
         dev_link_t              *(*attach)(void);
         void                    (*detach)(dev_link_t *);
         struct module           *owner;
+        struct pcmcia_device_id *id_table;
         struct device_driver    drv;
 };
 
@@ -173,7 +174,9 @@ struct pcmcia_device {
         u8                      has_manf_id:1;
         u8                      has_card_id:1;
         u8                      has_func_id:1;
-        u8                      reserved:5;
+
+        u8                      allow_func_id_match:1;
+        u8                      reserved:4;
 
         u8                      func_id;
         u16                     manf_id;