diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-12-04 03:58:56 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-12-04 03:58:56 +0000 |
| commit | 1d67e90f19a7acfd9a05dc59678e7d0c5090bd0d (patch) | |
| tree | 357efc7b93f8f5102110d20d293f41360ec212fc /arch/ppc/kernel/pci.c | |
| parent | aea27b2e18d69af87e673972246e66657b4fa274 (diff) | |
Merge with Linux 2.3.21.
Diffstat (limited to 'arch/ppc/kernel/pci.c')
| -rw-r--r-- | arch/ppc/kernel/pci.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/arch/ppc/kernel/pci.c b/arch/ppc/kernel/pci.c index 2ed0f4a5b..575a18afe 100644 --- a/arch/ppc/kernel/pci.c +++ b/arch/ppc/kernel/pci.c @@ -1,5 +1,5 @@ /* - * $Id: pci.c,v 1.60 1999/09/08 03:04:07 cort Exp $ + * $Id: pci.c,v 1.64 1999/09/17 18:01:53 cort Exp $ * Common pmac/prep/chrp pci routines. -- Cort */ @@ -92,7 +92,7 @@ static void __init pcibios_claim_resources(struct pci_bus *bus) struct resource *pr; if (!r->start) continue; - pr = pci_find_parent_resource(dev, r); + pr = pci_find_parent_resource(dev, r, 0); if (!pr || request_resource(pr, r) < 0) { printk(KERN_ERR "PCI: Address space collision on region %d of device %s\n", idx, dev->name); @@ -117,7 +117,7 @@ char __init *pcibios_setup(char *str) return str; } -#ifndef CONFIG_MBX +#ifndef CONFIG_8xx /* Recursively searches any node that is of type PCI-PCI bridge. Without * this, the old code would miss children of P2P bridges and hence not * fix IRQ's for cards located behind P2P bridges. @@ -141,8 +141,3 @@ void __init fix_intr(struct device_node *node, struct pci_dev *dev) } } #endif - -int pcibios_assign_resource(struct pci_dev *pdev, int resource) -{ - return 0; -} |