summaryrefslogtreecommitdiffstats
path: root/arch/ia64/include/asm/processor.h
diff options
context:
space:
mode:
authorFengguang Wu <fengguang.wu@intel.com>2012-07-25 09:15:13 +0200
committerTony Luck <tony.luck@intel.com>2012-07-25 20:47:16 +0200
commitf9445a382e3b9fdd21db41a4825ca1399cd0a3f4 (patch)
tree2b5ba522111c062f646bc6c2b86dfebef272d864 /arch/ia64/include/asm/processor.h
parent[IA64] Mark PARAVIRT and KVM as broken (diff)
downloadlinux-f9445a382e3b9fdd21db41a4825ca1399cd0a3f4.tar.xz
linux-f9445a382e3b9fdd21db41a4825ca1399cd0a3f4.zip
[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/processor.h')
-rw-r--r--arch/ia64/include/asm/processor.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/include/asm/processor.h b/arch/ia64/include/asm/processor.h
index 832dd3789e9d..944152a50912 100644
--- a/arch/ia64/include/asm/processor.h
+++ b/arch/ia64/include/asm/processor.h
@@ -719,7 +719,7 @@ enum idle_boot_override {IDLE_NO_OVERRIDE=0, IDLE_HALT, IDLE_FORCE_MWAIT,
void default_idle(void);
-#define ia64_platform_is(x) (strcmp(x, platform_name) == 0)
+#define ia64_platform_is(x) (strcmp(x, ia64_platform_name) == 0)
#endif /* !__ASSEMBLY__ */