[PNP] Move ID declarations

This patch moves the PnP ID declarations to mod_devicetable.h like
most of the other buses.  It is from Takashi Iwai <tiwai@suse.de>.

diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
index 67cce1744c86eb2b9eb0b3dc9c10b977b91c63b5..c0d7ce138d9976a39a21c0cc36960f033c14bd20 100644 (file)
--- a/include/linux/mod_devicetable.h
+++ b/include/linux/mod_devicetable.h
@@ -148,4 +148,21 @@ struct ccw_device_id {
 #define CCW_DEVICE_ID_MATCH_DEVICE_MODEL       0x08
 
 
+#define PNP_ID_LEN     8
+#define PNP_MAX_DEVICES        8
+
+struct pnp_device_id {
+       __u8 id[PNP_ID_LEN];
+       kernel_ulong_t driver_data;
+};
+
+struct pnp_card_device_id {
+       __u8 id[PNP_ID_LEN];
+       kernel_ulong_t driver_data;
+       struct {
+               __u8 id[PNP_ID_LEN];
+       } devs[PNP_MAX_DEVICES];
+};
+
+
 #endif /* LINUX_MOD_DEVICETABLE_H */

diff --git a/include/linux/pnp.h b/include/linux/pnp.h
index 5aa6df8e1a5a83e3bf9f0354e6f8961c1c296d61..d728e2f5cf717da692715c55ce4ee14db33b694a 100644 (file)
--- a/include/linux/pnp.h
+++ b/include/linux/pnp.h
@@ -12,13 +12,12 @@
 #include <linux/device.h>
 #include <linux/list.h>
 #include <linux/errno.h>
+#include <linux/mod_devicetable.h>
 
 #define PNP_MAX_PORT           8
 #define PNP_MAX_MEM            4
 #define PNP_MAX_IRQ            2
 #define PNP_MAX_DMA            2
-#define PNP_MAX_DEVICES                8
-#define PNP_ID_LEN             8
 #define PNP_NAME_LEN           50
 
 struct pnp_protocol;
@@ -287,19 +286,6 @@ struct pnp_id {
        struct pnp_id * next;
 };
 
-struct pnp_device_id {
-       char id[PNP_ID_LEN];
-       unsigned long driver_data;      /* data private to the driver */
-};
-
-struct pnp_card_device_id {
-       char id[PNP_ID_LEN];
-       unsigned long driver_data;      /* data private to the driver */
-       struct {
-               char id[PNP_ID_LEN];
-       } devs[PNP_MAX_DEVICES];        /* logical devices */
-};
-
 struct pnp_driver {
        char * name;
        const struct pnp_device_id *id_table;