aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorKyle McMartin <kyle@mako.i.cabal.ca>2007-01-13 15:02:09 -0500
committerKyle McMartin <kyle@athena.road.mcmartin.ca>2007-02-17 01:09:12 -0500
commitf354ef8abe5d6d967c023b21980241e6f883a698 (patch)
treef427f59479d3d645ece5a631fad4024ba02dbca1 /include
parentf3cf2673358e4221afbb59721a8580a8f35479a5 (diff)
[PARISC] rename *_ANY_ID to PA_*_ANY_ID in the exported header
Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
Diffstat (limited to 'include')
-rw-r--r--include/asm-parisc/hardware.h5
-rw-r--r--include/linux/mod_devicetable.h8
2 files changed, 9 insertions, 4 deletions
diff --git a/include/asm-parisc/hardware.h b/include/asm-parisc/hardware.h
index ac5881492b1..76d880dc4ba 100644
--- a/include/asm-parisc/hardware.h
+++ b/include/asm-parisc/hardware.h
@@ -4,6 +4,11 @@
#include <linux/mod_devicetable.h>
#include <asm/pdc.h>
+#define HWTYPE_ANY_ID PA_HWTYPE_ANY_ID
+#define HVERSION_ANY_ID PA_HVERSION_ANY_ID
+#define HVERSION_REV_ANY_ID PA_HVERSION_REV_ANY_ID
+#define SVERSION_ANY_ID PA_SVERSION_ANY_ID
+
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 1632025f3e6..e96b2dee10b 100644
--- a/include/linux/mod_devicetable.h
+++ b/include/linux/mod_devicetable.h
@@ -327,9 +327,9 @@ struct parisc_device_id {
__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
+#define PA_HWTYPE_ANY_ID 0xff
+#define PA_HVERSION_REV_ANY_ID 0xff
+#define PA_HVERSION_ANY_ID 0xffff
+#define PA_SVERSION_ANY_ID 0xffffffff
#endif /* LINUX_MOD_DEVICETABLE_H */