diff options
| author | Fengguang Wu <fengguang.wu@intel.com> | 2012-07-25 15:15:13 +0800 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2012-07-25 11:47:16 -0700 |
| commit | f9445a382e3b9fdd21db41a4825ca1399cd0a3f4 (patch) | |
| tree | 2b5ba522111c062f646bc6c2b86dfebef272d864 /arch/ia64/pci | |
| parent | 0c406643d9f1a9071aa44045f897bce087fe3945 (diff) | |
| download | linux-3.10-f9445a382e3b9fdd21db41a4825ca1399cd0a3f4.tar.gz linux-3.10-f9445a382e3b9fdd21db41a4825ca1399cd0a3f4.tar.bz2 linux-3.10-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/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 f5959c0c181..eab28e31402 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. */ |