summaryrefslogtreecommitdiff
path: root/arch/x86/include/asm/pci.h
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2014-01-24 22:52:25 +0400
committerBjorn Helgaas <bhelgaas@google.com>2014-02-03 21:38:23 +0400
commit289a24a699ff808a9ebfaaf4c2759cb86932f664 (patch)
tree9f52a7be0502abe5bb4244472a52736a2173685d /arch/x86/include/asm/pci.h
parent3d2a366190778f30a2f10b5edaf32bcb236840fd (diff)
downloadlinux-289a24a699ff808a9ebfaaf4c2759cb86932f664.tar.xz
x86/PCI: Merge pci_scan_bus_on_node() into pcibios_scan_root()
pci_scan_bus_on_node() is only called by pcibios_scan_root(). This merges pci_scan_bus_on_node() into pcibios_scan_root() and removes pci_scan_bus_on_node(). Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'arch/x86/include/asm/pci.h')
-rw-r--r--arch/x86/include/asm/pci.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/x86/include/asm/pci.h b/arch/x86/include/asm/pci.h
index 4e891abf8b48..b52f9c0ec5fb 100644
--- a/arch/x86/include/asm/pci.h
+++ b/arch/x86/include/asm/pci.h
@@ -26,10 +26,6 @@ extern int pci_routeirq;
extern int noioapicquirk;
extern int noioapicreroute;
-/* scan a bus after allocating a pci_sysdata for it */
-extern struct pci_bus *pci_scan_bus_on_node(int busno, struct pci_ops *ops,
- int node);
-
#ifdef CONFIG_PCI
#ifdef CONFIG_PCI_DOMAINS