diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-09-13 11:24:25 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-09-13 11:24:25 -0400 |
| commit | b2315372eac9cd9f622c32a93e323cf6f0f03462 (patch) | |
| tree | 9e1faa7cdcddf5d90bec4fb9523742d4cce699a1 /arch/mips/pci/pci.c | |
| parent | 5326152fa182b0a16e4abf913ce403e3c7ab53b7 (diff) | |
| parent | c87ce65868bbf9bbea9c3f112ff8315302daf8f2 (diff) | |
Merge branch 'linux-2.6' into for-2.6.24
Diffstat (limited to 'arch/mips/pci/pci.c')
| -rw-r--r-- | arch/mips/pci/pci.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/mips/pci/pci.c b/arch/mips/pci/pci.c index 6c5c684d1422..589b745d822a 100644 --- a/arch/mips/pci/pci.c +++ b/arch/mips/pci/pci.c | |||
| @@ -141,6 +141,7 @@ static int __init pcibios_init(void) | |||
| 141 | 141 | ||
| 142 | bus = pci_scan_bus(next_busno, hose->pci_ops, hose); | 142 | bus = pci_scan_bus(next_busno, hose->pci_ops, hose); |
| 143 | hose->bus = bus; | 143 | hose->bus = bus; |
| 144 | need_domain_info = need_domain_info || hose->index; | ||
| 144 | hose->need_domain_info = need_domain_info; | 145 | hose->need_domain_info = need_domain_info; |
| 145 | if (bus) { | 146 | if (bus) { |
| 146 | next_busno = bus->subordinate + 1; | 147 | next_busno = bus->subordinate + 1; |