commit f354ef8abe5d6d967c023b21980241e6f883a698
author Kyle McMartin <kyle@mako.i.cabal.ca> Sat Jan 13 15:02:09 2007 -0500
committer Kyle McMartin <kyle@athena.road.mcmartin.ca> Sat Feb 17 01:09:12 2007 -0500
tree f427f59479d3d645ece5a631fad4024ba02dbca1
parent f3cf2673358e4221afbb59721a8580a8f35479a5

[PARISC] rename *_ANY_ID to PA_*_ANY_ID in the exported header


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

include/asm-parisc/hardware.h

diff --git a/include/asm-parisc/hardware.h b/include/asm-parisc/hardware.h
index ac58814..76d880d 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;

include/linux/mod_devicetable.h

diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
index 1632025..e96b2de 100644
--- a/include/linux/mod_devicetable.h
+++ b/include/linux/mod_devicetable.h
@@ -327,9 +327,9 @@
 	__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 */

scripts/mod/file2alias.c

diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
index 717b04a..b2f73ff 100644
--- a/scripts/mod/file2alias.c
+++ b/scripts/mod/file2alias.c
@@ -462,10 +462,10 @@
 	id->sversion = TO_NATIVE(id->sversion);
 
 	strcpy(alias, "parisc:");
-	ADD(alias, "t", id->hw_type != HWTYPE_ANY_ID, id->hw_type);
-	ADD(alias, "hv", id->hversion != HVERSION_ANY_ID, id->hversion);
-	ADD(alias, "rev", id->hversion_rev != HVERSION_REV_ANY_ID, id->hversion_rev);
-	ADD(alias, "sv", id->sversion != SVERSION_ANY_ID, id->sversion);
+	ADD(alias, "t", id->hw_type != PA_HWTYPE_ANY_ID, id->hw_type);
+	ADD(alias, "hv", id->hversion != PA_HVERSION_ANY_ID, id->hversion);
+	ADD(alias, "rev", id->hversion_rev != PA_HVERSION_REV_ANY_ID, id->hversion_rev);
+	ADD(alias, "sv", id->sversion != PA_SVERSION_ANY_ID, id->sversion);
 
 	return 1;
 }