From: Bjorn Helgaas <bhelgaas@google.com>
Date: Wed, 19 Feb 2014 00:02:04 +0000 (-0700)
Subject: Merge branch 'pci/misc' into next
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=94a5f850aead02f02f350d401a43c4bf9a9fbf3a;p=linux-beck.git

Merge branch 'pci/misc' into next

* pci/misc:
  PCI: Enable INTx if BIOS left them disabled
  ia64/PCI: Set IORESOURCE_ROM_SHADOW only for the default VGA device
  x86/PCI: Set IORESOURCE_ROM_SHADOW only for the default VGA device
  PCI: Update outdated comment for pcibios_bus_report_status()
  PCI: Cleanup per-arch list of object files
  PCI: cpqphp: Fix hex vs decimal typo in cpqhpc_probe()
  x86/PCI: Fix function definition whitespace
  x86/PCI: Reword comments
  x86/PCI: Remove unnecessary local variable initialization
  PCI: Remove unnecessary list_empty(&pci_pme_list) check
---

94a5f850aead02f02f350d401a43c4bf9a9fbf3a
diff --cc arch/x86/pci/acpi.c
index f44a64c74e37,b0bc5920f5c6..01edac6c5e18
--- a/arch/x86/pci/acpi.c
+++ b/arch/x86/pci/acpi.c
@@@ -477,9 -474,12 +474,9 @@@ struct pci_bus *pci_acpi_scan_root(stru
  	int domain = root->segment;
  	int busnum = root->secondary.start;
  	LIST_HEAD(resources);
- 	struct pci_bus *bus = NULL;
+ 	struct pci_bus *bus;
  	struct pci_sysdata *sd;
  	int node;
 -#ifdef CONFIG_ACPI_NUMA
 -	int pxm;
 -#endif
  
  	if (pci_ignore_seg)
  		domain = 0;