diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-06-29 18:21:41 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-06-29 18:21:41 -0400 |
| commit | d18bfacff20f08aecf01bb971b110ca108eef3c7 (patch) | |
| tree | 255f862839c593c796e609328575b611e3f56cf3 /arch/i386/pci/numa.c | |
| parent | a68db763af9b676590c3fe9ec3f17bf18015eb2f (diff) | |
| parent | fd782a4a99d2d3e818b9465c427b10f7f027d7da (diff) | |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'arch/i386/pci/numa.c')
| -rw-r--r-- | arch/i386/pci/numa.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/i386/pci/numa.c b/arch/i386/pci/numa.c index 9e3695461899..adbe17a38f6f 100644 --- a/arch/i386/pci/numa.c +++ b/arch/i386/pci/numa.c | |||
| @@ -115,6 +115,8 @@ static int __init pci_numa_init(void) | |||
| 115 | return 0; | 115 | return 0; |
| 116 | 116 | ||
| 117 | pci_root_bus = pcibios_scan_root(0); | 117 | pci_root_bus = pcibios_scan_root(0); |
| 118 | if (pci_root_bus) | ||
| 119 | pci_bus_add_devices(pci_root_bus); | ||
| 118 | if (num_online_nodes() > 1) | 120 | if (num_online_nodes() > 1) |
| 119 | for_each_online_node(quad) { | 121 | for_each_online_node(quad) { |
| 120 | if (quad == 0) | 122 | if (quad == 0) |