aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/asm-parisc/hardware.h5
-rw-r--r--include/linux/mod_devicetable.h8
-rw-r--r--scripts/mod/file2alias.c8
3 files changed, 13 insertions, 8 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 */
diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
index 717b04a3b40..b2f73ffb40b 100644
--- 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;
}