diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-30 13:22:19 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-30 13:22:19 -0700 |
| commit | 6d8a97af63222c5cbc7fe63ae19345e74e153e90 (patch) | |
| tree | 4b3e286c1f68bece1e839ae63f5c659711cae47d /arch/ia64/pci | |
| parent | Merge tag 'localmodconfig-v3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-kconfig (diff) | |
| parent | [IA64] Redefine ATOMIC_INIT and ATOMIC64_INIT to drop the casts (diff) | |
| download | linux-dev-6d8a97af63222c5cbc7fe63ae19345e74e153e90.tar.xz linux-dev-6d8a97af63222c5cbc7fe63ae19345e74e153e90.zip | |
Merge tag 'please-pull-ia64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux
Pull misc ia64 build fixes from Tony Luck.
* tag 'please-pull-ia64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
[IA64] Redefine ATOMIC_INIT and ATOMIC64_INIT to drop the casts
[IA64] Rename platform_name to ia64_platform_name
[IA64] Mark PARAVIRT and KVM as broken
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) 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. */ |