diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-06-16 12:08:13 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-06-16 12:08:13 -0400 |
| commit | f1bbbb6912662b9f6070c5bfc4ca9eb1f06a9d5b (patch) | |
| tree | c2c130a74be25b0b2dff992e1a195e2728bdaadd /include/linux/mod_devicetable.h | |
| parent | fd0961ff67727482bb20ca7e8ea97b83e9de2ddb (diff) | |
| parent | 7e27d6e778cd87b6f2415515d7127eba53fe5d02 (diff) | |
Merge branch 'master' into for-next
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 { | |||
| 509 | 509 | ||
| 510 | #define ZORRO_DEVICE_MODALIAS_FMT "zorro:i%08X" | 510 | #define ZORRO_DEVICE_MODALIAS_FMT "zorro:i%08X" |
| 511 | 511 | ||
| 512 | #define ISAPNP_ANY_ID 0xffff | ||
| 513 | struct isapnp_device_id { | ||
| 514 | unsigned short card_vendor, card_device; | ||
| 515 | unsigned short vendor, function; | ||
| 516 | kernel_ulong_t driver_data; /* data private to the driver */ | ||
| 517 | }; | ||
| 518 | |||
| 512 | #endif /* LINUX_MOD_DEVICETABLE_H */ | 519 | #endif /* LINUX_MOD_DEVICETABLE_H */ |