From: Kyle McMartin <kyle@mako.i.cabal.ca>
Date: Sat, 13 Jan 2007 19:57:25 +0000 (-0500)
Subject: [PARISC] move parisc_device_id definition to mod_devicetable.h
X-Git-Tag: v2.6.21-rc2~35^2~22
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=f2439b262ab11717c892efd5fdacf43f65f2a422;p=linux.git

[PARISC] move parisc_device_id definition to mod_devicetable.h

Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
---

diff --git a/include/asm-parisc/hardware.h b/include/asm-parisc/hardware.h
index 106d3f7cd882..ac5881492b10 100644
--- a/include/asm-parisc/hardware.h
+++ b/include/asm-parisc/hardware.h
@@ -1,20 +1,9 @@
 #ifndef _PARISC_HARDWARE_H
 #define _PARISC_HARDWARE_H
 
+#include <linux/mod_devicetable.h>
 #include <asm/pdc.h>
 
-struct parisc_device_id {
-	unsigned char	hw_type;	/* 5 bits used */
-	unsigned char	hversion_rev;	/* 4 bits */
-	unsigned short	hversion;	/* 12 bits */
-	unsigned int	sversion;	/* 20 bits */
-};
-
-#define HWTYPE_ANY_ID	0xff
-#define HVERSION_REV_ANY_ID	0xff
-#define HVERSION_ANY_ID	0xffff
-#define SVERSION_ANY_ID	0xffffffffU
-
 struct hp_hardware {
 	unsigned short	hw_type:5;	/* HPHW_xxx */
 	unsigned short	hversion;
diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
index e0c393cc7240..1632025f3e60 100644
--- a/include/linux/mod_devicetable.h
+++ b/include/linux/mod_devicetable.h
@@ -320,4 +320,16 @@ struct eisa_device_id {
 
 #define EISA_DEVICE_MODALIAS_FMT "eisa:s%s"
 
+struct parisc_device_id {
+	__u8	hw_type;	/* 5 bits used */
+	__u8	hversion_rev;	/* 4 bits */
+	__u16	hversion;	/* 12 bits */
+	__u32	sversion;	/* 20 bits */
+};
+
+#define HWTYPE_ANY_ID		0xff
+#define HVERSION_REV_ANY_ID	0xff
+#define HVERSION_ANY_ID		0xffff
+#define SVERSION_ANY_ID		0xffffffff
+
 #endif /* LINUX_MOD_DEVICETABLE_H */