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/kernel/pci_32.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/kernel/pci_32.c')
-rw-r--r-- | arch/powerpc/kernel/pci_32.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/pci_32.c b/arch/powerpc/kernel/pci_32.c index 56deb316efd3..df3251ccca0f 100644 --- a/arch/powerpc/kernel/pci_32.c +++ b/arch/powerpc/kernel/pci_32.c | |||
@@ -610,7 +610,7 @@ pcibios_enable_resources(struct pci_dev *dev, int mask) | |||
610 | static int next_controller_index; | 610 | static int next_controller_index; |
611 | 611 | ||
612 | struct pci_controller * __init | 612 | struct pci_controller * __init |
613 | pcibios_alloc_controller(void) | 613 | pcibios_alloc_controller(struct device_node *dev) |
614 | { | 614 | { |
615 | struct pci_controller *hose; | 615 | struct pci_controller *hose; |
616 | 616 | ||
@@ -621,6 +621,7 @@ pcibios_alloc_controller(void) | |||
621 | hose_tail = &hose->next; | 621 | hose_tail = &hose->next; |
622 | 622 | ||
623 | hose->global_number = next_controller_index++; | 623 | hose->global_number = next_controller_index++; |
624 | hose->arch_data = dev; | ||
624 | 625 | ||
625 | return hose; | 626 | return hose; |
626 | } | 627 | } |