diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-06 12:26:17 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-06 12:26:17 -0800 |
| commit | e1b7361f32fdf60f575566ddef8a36b33086631d (patch) | |
| tree | ee5e64036a4f99159d63d71fa603cf582729ef3a /drivers | |
| parent | ceaeee6ad6c2a24bf37d9f426414cf3007432352 (diff) | |
| parent | 84f4506cb788d85a50c97b399f2999f90e6272b0 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6:
[PARISC] lba_pci: pci_claim_resources disabled expansion roms
[PARISC] print more than one character at a time for pdc console
[PARISC] Update parisc-linux MAINTAINERS entries
[PARISC] timer interrupt should not be IRQ_DISABLED
Revert "[PARISC] import necessary bits of libgcc.a"
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/parisc/lba_pci.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/parisc/lba_pci.c b/drivers/parisc/lba_pci.c index 5eace9e66e1..66ce6104836 100644 --- a/drivers/parisc/lba_pci.c +++ b/drivers/parisc/lba_pci.c @@ -768,9 +768,13 @@ lba_fixup_bus(struct pci_bus *bus) DBG("lba_fixup_bus() WTF? 0x%lx [%lx/%lx] XXX", res->flags, res->start, res->end); } - if ((i != PCI_ROM_RESOURCE) || - (res->flags & IORESOURCE_ROM_ENABLE)) - pci_claim_resource(dev, i); + + /* + ** FIXME: this will result in whinging for devices + ** that share expansion ROMs (think quad tulip), but + ** isn't harmful. + */ + pci_claim_resource(dev, i); } #ifdef FBB_SUPPORT |