diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-16 01:07:24 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-16 01:07:24 +0000 |
| commit | 95db6b748fc86297827fbd9c9ef174d491c9ad89 (patch) | |
| tree | 27a92a942821cde1edda9a1b088718d436b3efe4 /arch/mips64 | |
| parent | 45b27b0a0652331d104c953a5b192d843fff88f8 (diff) | |
Merge with Linux 2.3.40.
Diffstat (limited to 'arch/mips64')
| -rw-r--r-- | arch/mips64/defconfig | 1 | ||||
| -rw-r--r-- | arch/mips64/defconfig-ip27 | 1 | ||||
| -rw-r--r-- | arch/mips64/sgi-ip27/ip27-pci.c | 13 |
3 files changed, 13 insertions, 2 deletions
diff --git a/arch/mips64/defconfig b/arch/mips64/defconfig index 3fd8237b7..3c32d6c1a 100644 --- a/arch/mips64/defconfig +++ b/arch/mips64/defconfig @@ -13,6 +13,7 @@ # CONFIG_SGI_IP22 is not set CONFIG_SGI_IP27=y # CONFIG_SGI_SN0_N_MODE is not set +CONFIG_DISCONTIGMEM=y CONFIG_BOOT_ELF64=y CONFIG_ARC64=y CONFIG_COHERENT_IO=y diff --git a/arch/mips64/defconfig-ip27 b/arch/mips64/defconfig-ip27 index 3fd8237b7..3c32d6c1a 100644 --- a/arch/mips64/defconfig-ip27 +++ b/arch/mips64/defconfig-ip27 @@ -13,6 +13,7 @@ # CONFIG_SGI_IP22 is not set CONFIG_SGI_IP27=y # CONFIG_SGI_SN0_N_MODE is not set +CONFIG_DISCONTIGMEM=y CONFIG_BOOT_ELF64=y CONFIG_ARC64=y CONFIG_COHERENT_IO=y diff --git a/arch/mips64/sgi-ip27/ip27-pci.c b/arch/mips64/sgi-ip27/ip27-pci.c index 45e9cd649..80868cf6a 100644 --- a/arch/mips64/sgi-ip27/ip27-pci.c +++ b/arch/mips64/sgi-ip27/ip27-pci.c @@ -1,4 +1,4 @@ -/* $Id: ip27-pci.c,v 1.5 2000/01/31 23:25:06 kanoj Exp $ +/* $Id: ip27-pci.c,v 1.7 2000/02/03 23:30:59 kanoj Exp $ * * This file is subject to the terms and conditions of the GNU General Public * License. See the file "COPYING" in the main directory of this archive @@ -172,6 +172,7 @@ void __init pcibios_fixup_bus(struct pci_bus *b) { unsigned short command; + struct list_head *ln; struct pci_dev *dev; pci_fixup_irqs(pci_swizzle, pci_map_irq); @@ -182,7 +183,8 @@ pcibios_fixup_bus(struct pci_bus *b) * stop working if we program the controllers as not having * PCI_COMMAND_MEMORY, so we have to fudge the mem_flags. */ - for (dev = b->devices; dev; dev = dev->sibling) { + for (ln=b->devices.next; ln != &b->devices; ln=ln->next) { + dev = pci_dev_b(ln); if (PCI_FUNC(dev->devfn) == 0) { if ((PCI_SLOT(dev->devfn) == 0) || (PCI_SLOT(dev->devfn) == 1)) { @@ -208,6 +210,13 @@ pcibios_fixup_pbus_ranges(struct pci_bus * bus, ranges->mem_end -= bus->resource[1]->start; } +int __init +pcibios_enable_device(struct pci_dev *dev) +{ + /* Not needed, since we enable all devices at startup. */ + return 0; +} + void __init pcibios_align_resource(void *data, struct resource *res, unsigned long size) { |