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

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

diff --git a/include/asm-parisc/hardware.h b/include/asm-parisc/hardware.h
index ac5881492b10be5b0a4beb84d0ffc3cedb0ec9aa..76d880dc4baebb4de2e62185cc78197c92be4768 100644 (file)
--- 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 1632025f3e60a5cb53cc9cd3fc1a2bb05691d71c..e96b2dee10bb8544d18e9804adb155a8d27bdd03 100644 (file)
--- 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 */

diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
index 717b04a3b40aa48c176a82803cbb8c55923b49c9..b2f73ffb40bde5e790c2a93fb68b9d215bbcf86a 100644 (file)
--- a/scripts/mod/file2alias.c
+++ b/scripts/mod/file2alias.c
@@ -462,10 +462,10 @@ static int do_parisc_entry(const char *filename, struct parisc_device_id *id,
        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;
 }