diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-07-03 21:46:06 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-07-03 21:46:06 +0000 |
| commit | 3e414096429d55fbc8116171bba3487647bbe638 (patch) | |
| tree | 2b5fcfd9d16fa3a32c829fc2076f6e3785b43374 /drivers/pnp | |
| parent | 20b23bfcf36fcb2d16d8b844501072541970637c (diff) | |
Merge with Linux 2.4.0-test3-pre2.
Diffstat (limited to 'drivers/pnp')
| -rw-r--r-- | drivers/pnp/isapnp.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/pnp/isapnp.c b/drivers/pnp/isapnp.c index 2115cdac9..4b2aacce6 100644 --- a/drivers/pnp/isapnp.c +++ b/drivers/pnp/isapnp.c @@ -527,9 +527,11 @@ static void __init isapnp_add_irq_resource(struct pci_dev *dev, ptr->next = irq; else (*res)->irq = irq; +#ifdef CONFIG_PCI for (i=0; i<16; i++) if (irq->map & i) pcibios_penalize_isa_irq(i); +#endif } /* |