diff options
author | Dominik Brodowski <linux@dominikbrodowski.net> | 2005-06-27 19:28:07 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-27 21:03:06 -0400 |
commit | ea7b38825bba66a81745a706da70a1c81adc95bd (patch) | |
tree | e4a55eb31a250cfc5465d17cc89450e0b5445862 /include/linux | |
parent | 23a83bfe6ab51c745d109d979c78a96fe3e93f5c (diff) |
[PATCH] pcmcia: match for fake CIS
Add another match flag for devices needing a CIS override. The driver will
only probe/attach if the CIS has been replaced before.
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/linux')
-rw-r--r-- | include/linux/mod_devicetable.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h index e9651cd8310c..c0106d68bb6d 100644 --- a/include/linux/mod_devicetable.h +++ b/include/linux/mod_devicetable.h | |||
@@ -196,6 +196,7 @@ struct pcmcia_device_id { | |||
196 | 196 | ||
197 | /* not matched against */ | 197 | /* not matched against */ |
198 | kernel_ulong_t driver_info; | 198 | kernel_ulong_t driver_info; |
199 | char * cisfile; | ||
199 | }; | 200 | }; |
200 | 201 | ||
201 | #define PCMCIA_DEV_ID_MATCH_MANF_ID 0x0001 | 202 | #define PCMCIA_DEV_ID_MATCH_MANF_ID 0x0001 |
@@ -207,5 +208,6 @@ struct pcmcia_device_id { | |||
207 | #define PCMCIA_DEV_ID_MATCH_PROD_ID3 0x0040 | 208 | #define PCMCIA_DEV_ID_MATCH_PROD_ID3 0x0040 |
208 | #define PCMCIA_DEV_ID_MATCH_PROD_ID4 0x0080 | 209 | #define PCMCIA_DEV_ID_MATCH_PROD_ID4 0x0080 |
209 | #define PCMCIA_DEV_ID_MATCH_DEVICE_NO 0x0100 | 210 | #define PCMCIA_DEV_ID_MATCH_DEVICE_NO 0x0100 |
211 | #define PCMCIA_DEV_ID_MATCH_FAKE_CIS 0x0200 | ||
210 | 212 | ||
211 | #endif /* LINUX_MOD_DEVICETABLE_H */ | 213 | #endif /* LINUX_MOD_DEVICETABLE_H */ |