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/powermac | |
parent | 5516b540e98de6f7474a4e7149470ad6a0bbc54a (diff) | |
download | op-kernel-dev-dbf8471f5294b27ba9b6232ffc177dcd4e0a2fa5.zip op-kernel-dev-dbf8471f5294b27ba9b6232ffc177dcd4e0a2fa5.tar.gz |
[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/powermac')
-rw-r--r-- | arch/powerpc/platforms/powermac/pci.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/powerpc/platforms/powermac/pci.c b/arch/powerpc/platforms/powermac/pci.c index fb853c0..92586db 100644 --- a/arch/powerpc/platforms/powermac/pci.c +++ b/arch/powerpc/platforms/powermac/pci.c @@ -916,15 +916,9 @@ static int __init pmac_add_bridge(struct device_node *dev) " bus 0\n", dev->full_name); } - /* XXX Different prototypes, to be merged */ -#ifdef CONFIG_PPC64 hose = pcibios_alloc_controller(dev); -#else - hose = pcibios_alloc_controller(); -#endif if (!hose) return -ENOMEM; - hose->arch_data = dev; hose->first_busno = bus_range ? bus_range[0] : 0; hose->last_busno = bus_range ? bus_range[1] : 0xff; |