summaryrefslogtreecommitdiffstats
path: root/include/linux/isapnp.h
diff options
context:
space:
mode:
authorRusty Russell <rusty@rustcorp.com.au>2010-05-19 17:33:38 -0600
committerRusty Russell <rusty@rustcorp.com.au>2010-05-19 17:33:38 +0930
commit90def62df67b423c4c976bc30eccb5957b7befda (patch)
treed13b19e2ff84625ae14341fa6d79fc6f2f696602 /include/linux/isapnp.h
parent537b60d17894b7c19a6060feae40299d7109d6e7 (diff)
downloadlinux-stable-90def62df67b423c4c976bc30eccb5957b7befda.tar.gz
linux-stable-90def62df67b423c4c976bc30eccb5957b7befda.tar.bz2
linux-stable-90def62df67b423c4c976bc30eccb5957b7befda.zip
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.h8
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 @@
*/
#ifdef __KERNEL__
+#include <linux/mod_devicetable.h>
#define DEVICE_COUNT_COMPATIBLE 4
-#define ISAPNP_ANY_ID 0xffff
#define ISAPNP_CARD_DEVS 8
#define ISAPNP_CARD_ID(_va, _vb, _vc, _device) \
@@ -74,12 +74,6 @@ struct isapnp_card_id {
#define ISAPNP_DEVICE_SINGLE_END \
.card_vendor = 0, .card_device = 0
-struct isapnp_device_id {
- unsigned short card_vendor, card_device;
- unsigned short vendor, function;
- unsigned long driver_data; /* data private to the driver */
-};
-
#if defined(CONFIG_ISAPNP) || (defined(CONFIG_ISAPNP_MODULE) && defined(MODULE))
#define __ISAPNP__