aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/platforms/86xx
diff options
context:
space:
mode:
authorKumar Gala <galak@kernel.crashing.org>2007-06-27 02:56:50 -0400
committerKumar Gala <galak@kernel.crashing.org>2007-06-29 02:58:39 -0400
commitdbf8471f5294b27ba9b6232ffc177dcd4e0a2fa5 (patch)
treefdecc58118c69b522c44cc654aaadb89e69771fc /arch/powerpc/platforms/86xx
parent5516b540e98de6f7474a4e7149470ad6a0bbc54a (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/86xx')
-rw-r--r--arch/powerpc/platforms/86xx/pci.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/86xx/pci.c b/arch/powerpc/platforms/86xx/pci.c
index 2d7254c91ad9..5cb2188ee406 100644
--- a/arch/powerpc/platforms/86xx/pci.c
+++ b/arch/powerpc/platforms/86xx/pci.c
@@ -196,10 +196,10 @@ int __init mpc86xx_add_bridge(struct device_node *dev)
196 " bus 0\n", dev->full_name); 196 " bus 0\n", dev->full_name);
197 197
198 pci_assign_all_buses = 1; 198 pci_assign_all_buses = 1;
199 hose = pcibios_alloc_controller(); 199 hose = pcibios_alloc_controller(dev);
200 if (!hose) 200 if (!hose)
201 return -ENOMEM; 201 return -ENOMEM;
202 hose->arch_data = dev; 202
203 hose->indirect_type = PPC_INDIRECT_TYPE_EXT_REG | 203 hose->indirect_type = PPC_INDIRECT_TYPE_EXT_REG |
204 PPC_INDIRECT_TYPE_SURPRESS_PRIMARY_BUS; 204 PPC_INDIRECT_TYPE_SURPRESS_PRIMARY_BUS;
205 205