diff options
| author | Paul Mackerras | 2005-10-22 07:03:21 +0200 |
|---|---|---|
| committer | Paul Mackerras | 2005-10-22 07:03:21 +0200 |
| commit | f7abbc190b0edec34627d5348ba1d5fa5577da77 (patch) | |
| tree | dc6a97aaef1cf9174af7e09329db85be0af13c16 /arch/ppc64/kernel/rtas_pci.c | |
| parent | ppc64/powerpc: Fix time initialization on SMP systems (diff) | |
| download | kernel-qcow2-linux-f7abbc190b0edec34627d5348ba1d5fa5577da77.tar.gz kernel-qcow2-linux-f7abbc190b0edec34627d5348ba1d5fa5577da77.tar.xz kernel-qcow2-linux-f7abbc190b0edec34627d5348ba1d5fa5577da77.zip | |
ppc64: Add a `primary' argument to pci_process_bridge_OF_ranges
... for consistency with ppc32 and to make the powermac merge easier.
Also make it use just a single resource in the host bridge for multiple
consecutive elements of the ranges property.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/ppc64/kernel/rtas_pci.c')
| -rw-r--r-- | arch/ppc64/kernel/rtas_pci.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/ppc64/kernel/rtas_pci.c b/arch/ppc64/kernel/rtas_pci.c index 20361bcd8cfb..3ad15c90fbbd 100644 --- a/arch/ppc64/kernel/rtas_pci.c +++ b/arch/ppc64/kernel/rtas_pci.c @@ -400,7 +400,7 @@ unsigned long __init find_and_init_phbs(void) if (!phb) continue; - pci_process_bridge_OF_ranges(phb, node); + pci_process_bridge_OF_ranges(phb, node, 0); pci_setup_phb_io(phb, index == 0); #ifdef CONFIG_PPC_PSERIES if (ppc64_interrupt_controller == IC_OPEN_PIC && pSeries_mpic) { @@ -450,7 +450,7 @@ struct pci_controller * __devinit init_phb_dynamic(struct device_node *dn) if (!phb) return NULL; - pci_process_bridge_OF_ranges(phb, dn); + pci_process_bridge_OF_ranges(phb, dn, primary); pci_setup_phb_io_dynamic(phb, primary); of_node_put(root); |