diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-21 17:15:44 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-21 17:15:44 -0700 |
| commit | a8251096b427283c47e7d8f9568be6b388dd68ec (patch) | |
| tree | edc9747e30b4b4413aa99acfbd3104d81b1c303b /include/linux/mod_devicetable.h | |
| parent | 27a3353a4525afe984f3b793681869d636136b69 (diff) | |
| parent | 480b02df3aa9f07d1c7df0cd8be7a5ca73893455 (diff) | |
| download | linux-a8251096b427283c47e7d8f9568be6b388dd68ec.tar.gz linux-a8251096b427283c47e7d8f9568be6b388dd68ec.tar.bz2 linux-a8251096b427283c47e7d8f9568be6b388dd68ec.zip | |
Merge branch 'modules' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus
* 'modules' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
module: drop the lock while waiting for module to complete initialization.
MODULE_DEVICE_TABLE(isapnp, ...) does nothing
hisax_fcpcipnp: fix broken isapnp device table.
isapnp: move definitions to mod_devicetable.h so file2alias can reach them.
Diffstat (limited to 'include/linux/mod_devicetable.h')
| -rw-r--r-- | include/linux/mod_devicetable.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h index 007fbaafead0..48c007dae476 100644 --- a/include/linux/mod_devicetable.h +++ b/include/linux/mod_devicetable.h @@ -509,4 +509,11 @@ struct zorro_device_id { #define ZORRO_DEVICE_MODALIAS_FMT "zorro:i%08X" +#define ISAPNP_ANY_ID 0xffff +struct isapnp_device_id { + unsigned short card_vendor, card_device; + unsigned short vendor, function; + kernel_ulong_t driver_data; /* data private to the driver */ +}; + #endif /* LINUX_MOD_DEVICETABLE_H */ |