summaryrefslogtreecommitdiff
path: root/arch/ia64/pci
diff options
context:
space:
mode:
authorFengguang Wu <fengguang.wu@intel.com>2012-07-25 11:15:13 +0400
committerTony Luck <tony.luck@intel.com>2012-07-25 22:47:16 +0400
commitf9445a382e3b9fdd21db41a4825ca1399cd0a3f4 (patch)
tree2b5ba522111c062f646bc6c2b86dfebef272d864 /arch/ia64/pci
parent0c406643d9f1a9071aa44045f897bce087fe3945 (diff)
downloadlinux-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/pci')
-rw-r--r--arch/ia64/pci/fixup.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/ia64/pci/fixup.c b/arch/ia64/pci/fixup.c
index f5959c0c1810..eab28e314022 100644
--- a/arch/ia64/pci/fixup.c
+++ b/arch/ia64/pci/fixup.c
@@ -30,8 +30,8 @@ static void __devinit pci_fixup_video(struct pci_dev *pdev)
struct pci_bus *bus;
u16 config;
- if ((strcmp(platform_name, "dig") != 0)
- && (strcmp(platform_name, "hpzx1") != 0))
+ if ((strcmp(ia64_platform_name, "dig") != 0)
+ && (strcmp(ia64_platform_name, "hpzx1") != 0))
return;
/* Maybe, this machine supports legacy memory map. */