diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-06-25 01:20:01 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-06-25 01:20:01 +0000 |
| commit | 3797ba0b62debb71af4606910acacc9896a9ae3b (patch) | |
| tree | 414eea76253c7871bfdf3bd9d1817771eb40917c /arch/i386/kernel/pci-pc.c | |
| parent | 2b6c0c580795a4404f72d2a794214dd9e080709d (diff) | |
Merge with Linux 2.4.0-test2.
Diffstat (limited to 'arch/i386/kernel/pci-pc.c')
| -rw-r--r-- | arch/i386/kernel/pci-pc.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/arch/i386/kernel/pci-pc.c b/arch/i386/kernel/pci-pc.c index 404a49868..258e63627 100644 --- a/arch/i386/kernel/pci-pc.c +++ b/arch/i386/kernel/pci-pc.c @@ -14,7 +14,6 @@ #include <asm/segment.h> #include <asm/io.h> -#include <asm/smp.h> #include "pci-i386.h" @@ -1046,13 +1045,6 @@ int pcibios_enable_device(struct pci_dev *dev) if ((err = pcibios_enable_resources(dev)) < 0) return err; - if (!dev->irq) { - u8 pin; - pci_read_config_byte(dev, PCI_INTERRUPT_PIN, &pin); - if (pin && !pcibios_lookup_irq(dev, 1)) - printk(KERN_WARNING "PCI: No IRQ known for interrupt pin %c of device %s.%s\n", - 'A' + pin - 1, dev->slot_name, - (pci_probe & PCI_BIOS_IRQ_SCAN) ? "" : " Please try using pci=biosirq."); - } + pcibios_enable_irq(dev); return 0; } |