diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-04-19 04:00:00 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-04-19 04:00:00 +0000 |
| commit | 46e045034336a2cc90c1798cd7cc07af744ddfd6 (patch) | |
| tree | 3b9b51fc482e729f663d25333e77fbed9aaa939a /arch/i386/kernel/pci-i386.c | |
| parent | 31dc59d503a02e84c4de98826452acaeb56dc15a (diff) | |
Merge with Linux 2.3.99-pre4.
Diffstat (limited to 'arch/i386/kernel/pci-i386.c')
| -rw-r--r-- | arch/i386/kernel/pci-i386.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/i386/kernel/pci-i386.c b/arch/i386/kernel/pci-i386.c index 942de9c79..cc3f8e1da 100644 --- a/arch/i386/kernel/pci-i386.c +++ b/arch/i386/kernel/pci-i386.c @@ -228,7 +228,7 @@ static void __init pcibios_allocate_resources(int pass) if (!pr || request_resource(pr, r) < 0) { printk(KERN_ERR "PCI: Cannot allocate resource region %d of device %s\n", idx, dev->slot_name); /* We'll assign a new address later */ - r->start -= r->end; + r->end -= r->start; r->start = 0; } } @@ -317,6 +317,8 @@ int pcibios_enable_resources(struct pci_dev *dev) if (r->flags & IORESOURCE_MEM) cmd |= PCI_COMMAND_MEMORY; } + if (dev->resource[PCI_ROM_RESOURCE].start) + cmd |= PCI_COMMAND_MEMORY; if (cmd != old_cmd) { printk("PCI: Enabling device %s (%04x -> %04x)\n", dev->slot_name, old_cmd, cmd); pci_write_config_word(dev, PCI_COMMAND, cmd); |