summaryrefslogtreecommitdiffstats
path: root/arch/ia64/include/asm/machvec_hpzx1.h
diff options
context:
space:
mode:
authorFengguang Wu <fengguang.wu@intel.com>2012-07-25 15:15:13 +0800
committerTony Luck <tony.luck@intel.com>2012-07-25 11:47:16 -0700
commitf9445a382e3b9fdd21db41a4825ca1399cd0a3f4 (patch)
tree2b5ba522111c062f646bc6c2b86dfebef272d864 /arch/ia64/include/asm/machvec_hpzx1.h
parent0c406643d9f1a9071aa44045f897bce087fe3945 (diff)
[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_hpzx1.h')
-rw-r--r--arch/ia64/include/asm/machvec_hpzx1.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/include/asm/machvec_hpzx1.h b/arch/ia64/include/asm/machvec_hpzx1.h
index 3bd83d78a41..c74d3159e9e 100644
--- a/arch/ia64/include/asm/machvec_hpzx1.h
+++ b/arch/ia64/include/asm/machvec_hpzx1.h
@@ -11,7 +11,7 @@ extern ia64_mv_dma_init sba_dma_init;
* platform's machvec structure. When compiling a non-generic kernel,
* the macros are used directly.
*/
-#define platform_name "hpzx1"
+#define ia64_platform_name "hpzx1"
#define platform_setup dig_setup
#define platform_dma_init sba_dma_init