diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2013-02-04 10:27:44 +0100 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2013-02-04 10:27:44 +0100 |
| commit | ba1b3afd50913473f3036a63b4a82d7ba5c42009 (patch) | |
| tree | 9dff0ddec4bf8b927a025b4bf9882cb1731170f3 /linux/src/drivers/net/pci-scan.c | |
| parent | bfdb3be16e5a20eebc97b3ca613d9a4da4465533 (diff) | |
| parent | 51e87d005139a435cd846ac5c224eed5042c4fa0 (diff) | |
Merge branch 'master' into master-gdb_stubs
Diffstat (limited to 'linux/src/drivers/net/pci-scan.c')
| -rw-r--r-- | linux/src/drivers/net/pci-scan.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/src/drivers/net/pci-scan.c b/linux/src/drivers/net/pci-scan.c index 6187d5db..60525b76 100644 --- a/linux/src/drivers/net/pci-scan.c +++ b/linux/src/drivers/net/pci-scan.c @@ -347,7 +347,7 @@ int pci_drv_register(struct drv_id_info *drv_id, void *initial_device) pci_tbl[chip_idx].name, pciaddr, irq); if ( ! (pci_flags & PCI_UNUSED_IRQ) && - (irq == 0 || irq == 255)) { + (irq == 0 || irq >= 16)) { if (pci_bus == 32) /* Broken CardBus activation. */ printk(KERN_WARNING "Resources for CardBus device '%s' have" " not been allocated.\n" |