diff options
| author |   Kumar Gala <galak@kernel.crashing.org> | 2007-06-27 01:56:50 -0500 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2007-06-29 01:58:39 -0500 |
| commit | dbf8471f5294b27ba9b6232ffc177dcd4e0a2fa5 (patch) | |
| tree | fdecc58118c69b522c44cc654aaadb89e69771fc /arch/powerpc/platforms/embedded6xx/linkstation.c | |
| parent | [POWERPC] Use global_number in ppc32 pci_controller (diff) | |
| download | linux-dev-dbf8471f5294b27ba9b6232ffc177dcd4e0a2fa5.tar.xz linux-dev-dbf8471f5294b27ba9b6232ffc177dcd4e0a2fa5.zip | |
[POWERPC] Merge ppc32 and ppc64 pcibios_alloc_controller() prototypes
Make the ppc32 pcibios_alloc_controller take a device node to match
the ppc64 prototypes and have it set arch_data.
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/platforms/embedded6xx/linkstation.c')
| -rw-r--r-- | arch/powerpc/platforms/embedded6xx/linkstation.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/embedded6xx/linkstation.c b/arch/powerpc/platforms/embedded6xx/linkstation.c index 885c789a8c2d..f4d0a7a603f5 100644 --- a/arch/powerpc/platforms/embedded6xx/linkstation.c +++ b/arch/powerpc/platforms/embedded6xx/linkstation.c @@ -68,12 +68,11 @@ static int __init linkstation_add_bridge(struct device_node *dev) printk(KERN_WARNING "Can't get bus-range for %s, assume" " bus 0\n", dev->full_name); - hose = pcibios_alloc_controller(); + hose = pcibios_alloc_controller(dev); if (hose == NULL) return -ENOMEM; hose->first_busno = bus_range ? bus_range[0] : 0; hose->last_busno = bus_range ? bus_range[1] : 0xff; - hose->arch_data = dev; setup_indirect_pci(hose, 0xfec00000, 0xfee00000); /* Interpret the "ranges" property */ |