diff options
| author | Fengguang Wu <fengguang.wu@intel.com> | 2012-07-25 11:15:13 +0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2012-07-25 22:47:16 +0400 |
| commit | f9445a382e3b9fdd21db41a4825ca1399cd0a3f4 (patch) | |
| tree | 2b5ba522111c062f646bc6c2b86dfebef272d864 /arch/ia64/include/asm/machvec_sn2.h | |
| parent | 0c406643d9f1a9071aa44045f897bce087fe3945 (diff) | |
| download | linux-f9445a382e3b9fdd21db41a4825ca1399cd0a3f4.tar.xz | |
[IA64] Rename platform_name to ia64_platform_name
The macro name is too generic and conflicts with
snd_soc_dai_link.platform_name, which triggers lots of build errors.
Signed-off-by: Fengguang Wu <fengguang.wu@intel.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch/ia64/include/asm/machvec_sn2.h')
| -rw-r--r-- | arch/ia64/include/asm/machvec_sn2.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/include/asm/machvec_sn2.h b/arch/ia64/include/asm/machvec_sn2.h index f061a30aac42..ece9fa85be88 100644 --- a/arch/ia64/include/asm/machvec_sn2.h +++ b/arch/ia64/include/asm/machvec_sn2.h @@ -71,7 +71,7 @@ extern ia64_mv_pci_fixup_bus_t sn_pci_fixup_bus; * platform's machvec structure. When compiling a non-generic kernel, * the macros are used directly. */ -#define platform_name "sn2" +#define ia64_platform_name "sn2" #define platform_setup sn_setup #define platform_cpu_init sn_cpu_init #define platform_irq_init sn_irq_init |