diff options
author | Fengguang Wu <fengguang.wu@intel.com> | 2012-07-25 03:15:13 -0400 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2012-07-25 14:47:16 -0400 |
commit | f9445a382e3b9fdd21db41a4825ca1399cd0a3f4 (patch) | |
tree | 2b5ba522111c062f646bc6c2b86dfebef272d864 /arch/ia64/pci | |
parent | 0c406643d9f1a9071aa44045f897bce087fe3945 (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/pci')
-rw-r--r-- | arch/ia64/pci/fixup.c | 4 |
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) | |||
30 | struct pci_bus *bus; | 30 | struct pci_bus *bus; |
31 | u16 config; | 31 | u16 config; |
32 | 32 | ||
33 | if ((strcmp(platform_name, "dig") != 0) | 33 | if ((strcmp(ia64_platform_name, "dig") != 0) |
34 | && (strcmp(platform_name, "hpzx1") != 0)) | 34 | && (strcmp(ia64_platform_name, "hpzx1") != 0)) |
35 | return; | 35 | return; |
36 | /* Maybe, this machine supports legacy memory map. */ | 36 | /* Maybe, this machine supports legacy memory map. */ |
37 | 37 | ||