diff options
author | Kumar Gala <galak@kernel.crashing.org> | 2007-06-27 02:56:50 -0400 |
---|---|---|
committer | Kumar Gala <galak@kernel.crashing.org> | 2007-06-29 02:58:39 -0400 |
commit | dbf8471f5294b27ba9b6232ffc177dcd4e0a2fa5 (patch) | |
tree | fdecc58118c69b522c44cc654aaadb89e69771fc /arch/powerpc/platforms/83xx | |
parent | 5516b540e98de6f7474a4e7149470ad6a0bbc54a (diff) |
[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/83xx')
-rw-r--r-- | arch/powerpc/platforms/83xx/pci.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/83xx/pci.c b/arch/powerpc/platforms/83xx/pci.c index f49ed277e843..c0e2b89154e5 100644 --- a/arch/powerpc/platforms/83xx/pci.c +++ b/arch/powerpc/platforms/83xx/pci.c | |||
@@ -62,10 +62,9 @@ int __init mpc83xx_add_bridge(struct device_node *dev) | |||
62 | } | 62 | } |
63 | 63 | ||
64 | pci_assign_all_buses = 1; | 64 | pci_assign_all_buses = 1; |
65 | hose = pcibios_alloc_controller(); | 65 | hose = pcibios_alloc_controller(dev); |
66 | if (!hose) | 66 | if (!hose) |
67 | return -ENOMEM; | 67 | return -ENOMEM; |
68 | hose->arch_data = dev; | ||
69 | 68 | ||
70 | hose->first_busno = bus_range ? bus_range[0] : 0; | 69 | hose->first_busno = bus_range ? bus_range[0] : 0; |
71 | hose->last_busno = bus_range ? bus_range[1] : 0xff; | 70 | hose->last_busno = bus_range ? bus_range[1] : 0xff; |