diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-16 07:58:48 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-16 07:58:48 -0800 |
| commit | d58a75ef75ad98f2d20ee6dccfc71f881aabffb0 (patch) | |
| tree | fbfa28526e3e2695c61d83a1a4997a8c3d00b686 /arch/powerpc/platforms/iseries/pci.c | |
| parent | f6ff56cd56b83d8edf4b3cffc5c53c56b37a5081 (diff) | |
| parent | 5d66da3d71e6aeca80ca08dbebd8a1cd72e6ee1f (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge
Diffstat (limited to 'arch/powerpc/platforms/iseries/pci.c')
| -rw-r--r-- | arch/powerpc/platforms/iseries/pci.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/iseries/pci.c b/arch/powerpc/platforms/iseries/pci.c index 4b75131773a..dafc518fbb8 100644 --- a/arch/powerpc/platforms/iseries/pci.c +++ b/arch/powerpc/platforms/iseries/pci.c @@ -244,10 +244,9 @@ unsigned long __init find_and_init_phbs(void) if (ret == 0) { printk("bus %d appears to exist\n", bus); - phb = (struct pci_controller *)kmalloc(sizeof(struct pci_controller), GFP_KERNEL); + phb = pcibios_alloc_controller(NULL); if (phb == NULL) return -ENOMEM; - pci_setup_pci_controller(phb); phb->pci_mem_offset = phb->local_number = bus; phb->first_busno = bus; |