Bladeren bron

[PARISC] move parisc_device_id definition to mod_devicetable.h

Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
Kyle McMartin 18 jaren geleden
bovenliggende
commit
f2439b262a
2 gewijzigde bestanden met toevoegingen van 13 en 12 verwijderingen
  1. 1 12
      include/asm-parisc/hardware.h
  2. 12 0
      include/linux/mod_devicetable.h

+ 1 - 12
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;

+ 12 - 0
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 */