Merge commit 'kumar/next' into next

[~andy/linux] / include / linux / isapnp.h

diff --git a/include/linux/isapnp.h b/include/linux/isapnp.h
index cd5a269fdb5e3a5280002c6dd767ee4efe331a48..e2d28b026a8ca3fb362341decd8f1a6f64904ea5 100644 (file)
--- 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__