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/embedded6xx | |
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/embedded6xx')
-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) | |||
68 | printk(KERN_WARNING "Can't get bus-range for %s, assume" | 68 | printk(KERN_WARNING "Can't get bus-range for %s, assume" |
69 | " bus 0\n", dev->full_name); | 69 | " bus 0\n", dev->full_name); |
70 | 70 | ||
71 | hose = pcibios_alloc_controller(); | 71 | hose = pcibios_alloc_controller(dev); |
72 | if (hose == NULL) | 72 | if (hose == NULL) |
73 | return -ENOMEM; | 73 | return -ENOMEM; |
74 | hose->first_busno = bus_range ? bus_range[0] : 0; | 74 | hose->first_busno = bus_range ? bus_range[0] : 0; |
75 | hose->last_busno = bus_range ? bus_range[1] : 0xff; | 75 | hose->last_busno = bus_range ? bus_range[1] : 0xff; |
76 | hose->arch_data = dev; | ||
77 | setup_indirect_pci(hose, 0xfec00000, 0xfee00000); | 76 | setup_indirect_pci(hose, 0xfec00000, 0xfee00000); |
78 | 77 | ||
79 | /* Interpret the "ranges" property */ | 78 | /* Interpret the "ranges" property */ |