diff options
| author | Dominik Brodowski <linux@dominikbrodowski.net> | 2005-06-27 16:28:06 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-27 18:03:06 -0700 |
| commit | 1ad275e3e7d253d44f03868e85977c908e334fed (patch) | |
| tree | 82f0a1fc070f32c015be14596c50c681d90d4c1a /include/pcmcia/ds.h | |
| parent | 3ee13937525f6044d769b1a84d5db5669ac1959e (diff) | |
| download | linux-1ad275e3e7d253d44f03868e85977c908e334fed.tar.gz linux-1ad275e3e7d253d44f03868e85977c908e334fed.tar.bz2 linux-1ad275e3e7d253d44f03868e85977c908e334fed.zip | |
[PATCH] pcmcia: device and driver matching
The actual matching of pcmcia drivers and pcmcia devices. The original
version of this was written by David Woodhouse.
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
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 @@ #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; @@ -135,6 +137,7 @@ 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 +176,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; |