diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2013-01-09 11:37:01 -0700 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2013-01-09 11:37:01 -0700 |
| commit | e84d0dedd324379bd784be748314b251334a79b6 (patch) | |
| tree | 0d7022be3ce5e339410b6dd39f4304180431b381 /arch/x86 | |
| parent | d1c3ed669a2d452cacfb48c2d171a1f364dae2ed (diff) | |
| parent | 3ecd9d01f7dffd5a2291267ba0410e1826c87530 (diff) | |
| download | linux-e84d0dedd324379bd784be748314b251334a79b6.tar.gz linux-e84d0dedd324379bd784be748314b251334a79b6.tar.bz2 linux-e84d0dedd324379bd784be748314b251334a79b6.zip | |
Merge branch 'pci/misc' into next
* pci/misc:
PCI: cpqphp: Cleanup and remove unreachable paths
PCI: Drop "__" prefix on __pci_enable_device_flags()
PCI: Use "unsigned long" for __pci_enable_device_flags to match ioport.h
mn10300/PCI: Remove unused pci_root_bus
frv/PCI: Remove unused pci_root_bus
x86/PCI: Remove unused pci_root_bus
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/include/asm/pci_x86.h | 1 | ||||
| -rw-r--r-- | arch/x86/pci/common.c | 1 | ||||
| -rw-r--r-- | arch/x86/pci/legacy.c | 2 | ||||
| -rw-r--r-- | arch/x86/pci/numaq_32.c | 2 |
4 files changed, 2 insertions, 4 deletions
diff --git a/arch/x86/include/asm/pci_x86.h b/arch/x86/include/asm/pci_x86.h index 73e8eeff22ee..0126f104f0a5 100644 --- a/arch/x86/include/asm/pci_x86.h +++ b/arch/x86/include/asm/pci_x86.h @@ -54,7 +54,6 @@ void pcibios_set_cache_line_size(void); /* pci-pc.c */ extern int pcibios_last_bus; -extern struct pci_bus *pci_root_bus; extern struct pci_ops pci_root_ops; void pcibios_scan_specific_bus(int busn); diff --git a/arch/x86/pci/common.c b/arch/x86/pci/common.c index 412e1286d1fc..505731b139f4 100644 --- a/arch/x86/pci/common.c +++ b/arch/x86/pci/common.c @@ -34,7 +34,6 @@ int noioapicreroute = 1; #endif int pcibios_last_bus = -1; unsigned long pirq_table_addr; -struct pci_bus *pci_root_bus; const struct pci_raw_ops *__read_mostly raw_pci_ops; const struct pci_raw_ops *__read_mostly raw_pci_ext_ops; diff --git a/arch/x86/pci/legacy.c b/arch/x86/pci/legacy.c index a1df191129d3..a9e83083fb85 100644 --- a/arch/x86/pci/legacy.c +++ b/arch/x86/pci/legacy.c @@ -30,7 +30,7 @@ int __init pci_legacy_init(void) } printk("PCI: Probing PCI hardware\n"); - pci_root_bus = pcibios_scan_root(0); + pcibios_scan_root(0); return 0; } diff --git a/arch/x86/pci/numaq_32.c b/arch/x86/pci/numaq_32.c index 83e125b95ca6..00edfe652b72 100644 --- a/arch/x86/pci/numaq_32.c +++ b/arch/x86/pci/numaq_32.c @@ -152,7 +152,7 @@ int __init pci_numaq_init(void) raw_pci_ops = &pci_direct_conf1_mq; - pci_root_bus = pcibios_scan_root(0); + pcibios_scan_root(0); if (num_online_nodes() > 1) for_each_online_node(quad) { if (quad == 0) |