Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit f354ef8abe5d6d967c023b21980241e6f883a698

Authored by Kyle McMartin
Committed by Kyle McMartin
1 parent f3cf267335
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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

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

Showing 3 changed files with 13 additions and 8 deletions Side-by-side Diff

include/asm-parisc/hardware.h
Diff comments   View file @ f354ef8
... ... @@ -4,6 +4,11 @@
4 4 #include <linux/mod_devicetable.h>
5 5 #include <asm/pdc.h>
6 6  
  7 +#define HWTYPE_ANY_ID PA_HWTYPE_ANY_ID
  8 +#define HVERSION_ANY_ID PA_HVERSION_ANY_ID
  9 +#define HVERSION_REV_ANY_ID PA_HVERSION_REV_ANY_ID
  10 +#define SVERSION_ANY_ID PA_SVERSION_ANY_ID
  11 +
7 12 struct hp_hardware {
8 13 unsigned short hw_type:5; /* HPHW_xxx */
9 14 unsigned short hversion;
include/linux/mod_devicetable.h
Diff comments   View file @ f354ef8
... ... @@ -327,10 +327,10 @@
327 327 __u32 sversion; /* 20 bits */
328 328 };
329 329  
330   -#define HWTYPE_ANY_ID 0xff
331   -#define HVERSION_REV_ANY_ID 0xff
332   -#define HVERSION_ANY_ID 0xffff
333   -#define SVERSION_ANY_ID 0xffffffff
  330 +#define PA_HWTYPE_ANY_ID 0xff
  331 +#define PA_HVERSION_REV_ANY_ID 0xff
  332 +#define PA_HVERSION_ANY_ID 0xffff
  333 +#define PA_SVERSION_ANY_ID 0xffffffff
334 334  
335 335 #endif /* LINUX_MOD_DEVICETABLE_H */
scripts/mod/file2alias.c
Diff comments   View file @ f354ef8
... ... @@ -462,10 +462,10 @@
462 462 id->sversion = TO_NATIVE(id->sversion);
463 463  
464 464 strcpy(alias, "parisc:");
465   - ADD(alias, "t", id->hw_type != HWTYPE_ANY_ID, id->hw_type);
466   - ADD(alias, "hv", id->hversion != HVERSION_ANY_ID, id->hversion);
467   - ADD(alias, "rev", id->hversion_rev != HVERSION_REV_ANY_ID, id->hversion_rev);
468   - ADD(alias, "sv", id->sversion != SVERSION_ANY_ID, id->sversion);
  465 + ADD(alias, "t", id->hw_type != PA_HWTYPE_ANY_ID, id->hw_type);
  466 + ADD(alias, "hv", id->hversion != PA_HVERSION_ANY_ID, id->hversion);
  467 + ADD(alias, "rev", id->hversion_rev != PA_HVERSION_REV_ANY_ID, id->hversion_rev);
  468 + ADD(alias, "sv", id->sversion != PA_SVERSION_ANY_ID, id->sversion);
469 469  
470 470 return 1;
471 471 }