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/sysdev/mv64x60_pci.c | |
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/sysdev/mv64x60_pci.c')
-rw-r--r-- | arch/powerpc/sysdev/mv64x60_pci.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/powerpc/sysdev/mv64x60_pci.c b/arch/powerpc/sysdev/mv64x60_pci.c index 2e7738455ae5..45db86c2363c 100644 --- a/arch/powerpc/sysdev/mv64x60_pci.c +++ b/arch/powerpc/sysdev/mv64x60_pci.c | |||
@@ -137,12 +137,10 @@ static int __init mv64x60_add_bridge(struct device_node *dev) | |||
137 | printk(KERN_WARNING "Can't get bus-range for %s, assume" | 137 | printk(KERN_WARNING "Can't get bus-range for %s, assume" |
138 | " bus 0\n", dev->full_name); | 138 | " bus 0\n", dev->full_name); |
139 | 139 | ||
140 | hose = pcibios_alloc_controller(); | 140 | hose = pcibios_alloc_controller(dev); |
141 | if (!hose) | 141 | if (!hose) |
142 | return -ENOMEM; | 142 | return -ENOMEM; |
143 | 143 | ||
144 | hose->arch_data = dev; | ||
145 | |||
146 | hose->first_busno = bus_range ? bus_range[0] : 0; | 144 | hose->first_busno = bus_range ? bus_range[0] : 0; |
147 | hose->last_busno = bus_range ? bus_range[1] : 0xff; | 145 | hose->last_busno = bus_range ? bus_range[1] : 0xff; |
148 | 146 | ||