diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-13 10:00:22 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-13 10:00:22 -0500 |
| commit | 4de3a8e101150feaefa1139611a50ff37467f33e (patch) | |
| tree | daada742542518b02d7db7c5d32e715eaa5f166d /arch/x86/pci/numaq_32.c | |
| parent | 294064f58953f9964e5945424b09c51800330a83 (diff) | |
| parent | 099469502f62fbe0d7e4f0b83a2f22538367f734 (diff) | |
Merge branch 'master' into fixes
Diffstat (limited to 'arch/x86/pci/numaq_32.c')
| -rw-r--r-- | arch/x86/pci/numaq_32.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/x86/pci/numaq_32.c b/arch/x86/pci/numaq_32.c index 51abf02f9226..83e125b95ca6 100644 --- a/arch/x86/pci/numaq_32.c +++ b/arch/x86/pci/numaq_32.c | |||
| @@ -153,8 +153,6 @@ int __init pci_numaq_init(void) | |||
| 153 | raw_pci_ops = &pci_direct_conf1_mq; | 153 | raw_pci_ops = &pci_direct_conf1_mq; |
| 154 | 154 | ||
| 155 | pci_root_bus = pcibios_scan_root(0); | 155 | pci_root_bus = pcibios_scan_root(0); |
| 156 | if (pci_root_bus) | ||
| 157 | pci_bus_add_devices(pci_root_bus); | ||
| 158 | if (num_online_nodes() > 1) | 156 | if (num_online_nodes() > 1) |
| 159 | for_each_online_node(quad) { | 157 | for_each_online_node(quad) { |
| 160 | if (quad == 0) | 158 | if (quad == 0) |