diff options
author | Rusty Russell <rusty@rustcorp.com.au> | 2010-05-19 19:33:38 -0400 |
---|---|---|
committer | Rusty Russell <rusty@rustcorp.com.au> | 2010-05-19 04:03:38 -0400 |
commit | 90def62df67b423c4c976bc30eccb5957b7befda (patch) | |
tree | d13b19e2ff84625ae14341fa6d79fc6f2f696602 /include/linux/isapnp.h | |
parent | 537b60d17894b7c19a6060feae40299d7109d6e7 (diff) |
isapnp: move definitions to mod_devicetable.h so file2alias can reach them.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Diffstat (limited to 'include/linux/isapnp.h')
-rw-r--r-- | include/linux/isapnp.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/include/linux/isapnp.h b/include/linux/isapnp.h index cd5a269fdb5e..e2d28b026a8c 100644 --- a/include/linux/isapnp.h +++ b/include/linux/isapnp.h | |||
@@ -43,10 +43,10 @@ | |||
43 | */ | 43 | */ |
44 | 44 | ||
45 | #ifdef __KERNEL__ | 45 | #ifdef __KERNEL__ |
46 | #include <linux/mod_devicetable.h> | ||
46 | 47 | ||
47 | #define DEVICE_COUNT_COMPATIBLE 4 | 48 | #define DEVICE_COUNT_COMPATIBLE 4 |
48 | 49 | ||
49 | #define ISAPNP_ANY_ID 0xffff | ||
50 | #define ISAPNP_CARD_DEVS 8 | 50 | #define ISAPNP_CARD_DEVS 8 |
51 | 51 | ||
52 | #define ISAPNP_CARD_ID(_va, _vb, _vc, _device) \ | 52 | #define ISAPNP_CARD_ID(_va, _vb, _vc, _device) \ |
@@ -74,12 +74,6 @@ struct isapnp_card_id { | |||
74 | #define ISAPNP_DEVICE_SINGLE_END \ | 74 | #define ISAPNP_DEVICE_SINGLE_END \ |
75 | .card_vendor = 0, .card_device = 0 | 75 | .card_vendor = 0, .card_device = 0 |
76 | 76 | ||
77 | struct isapnp_device_id { | ||
78 | unsigned short card_vendor, card_device; | ||
79 | unsigned short vendor, function; | ||
80 | unsigned long driver_data; /* data private to the driver */ | ||
81 | }; | ||
82 | |||
83 | #if defined(CONFIG_ISAPNP) || (defined(CONFIG_ISAPNP_MODULE) && defined(MODULE)) | 77 | #if defined(CONFIG_ISAPNP) || (defined(CONFIG_ISAPNP_MODULE) && defined(MODULE)) |
84 | 78 | ||
85 | #define __ISAPNP__ | 79 | #define __ISAPNP__ |