forked from Minki/linux
[PARISC] rename *_ANY_ID to PA_*_ANY_ID in the exported header
Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
This commit is contained in:
parent
f3cf267335
commit
f354ef8abe
@ -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;
|
||||
|
@ -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 */
|
||||
|
@ -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;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user