diff options
Diffstat (limited to 'drivers/net/3c59x.c')
| -rw-r--r-- | drivers/net/3c59x.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/3c59x.c b/drivers/net/3c59x.c index 45125db44177..8ab03b4a885e 100644 --- a/drivers/net/3c59x.c +++ b/drivers/net/3c59x.c | |||
| @@ -996,7 +996,7 @@ static int vortex_resume(struct pci_dev *pdev) | |||
| 996 | pci_enable_device(pdev); | 996 | pci_enable_device(pdev); |
| 997 | pci_set_master(pdev); | 997 | pci_set_master(pdev); |
| 998 | if (request_irq(dev->irq, vp->full_bus_master_rx ? | 998 | if (request_irq(dev->irq, vp->full_bus_master_rx ? |
| 999 | &boomerang_interrupt : &vortex_interrupt, SA_SHIRQ, dev->name, dev)) { | 999 | &boomerang_interrupt : &vortex_interrupt, IRQF_SHARED, dev->name, dev)) { |
| 1000 | printk(KERN_WARNING "%s: Could not reserve IRQ %d\n", dev->name, dev->irq); | 1000 | printk(KERN_WARNING "%s: Could not reserve IRQ %d\n", dev->name, dev->irq); |
| 1001 | pci_disable_device(pdev); | 1001 | pci_disable_device(pdev); |
| 1002 | return -EBUSY; | 1002 | return -EBUSY; |
| @@ -1833,7 +1833,7 @@ vortex_open(struct net_device *dev) | |||
| 1833 | 1833 | ||
| 1834 | /* Use the now-standard shared IRQ implementation. */ | 1834 | /* Use the now-standard shared IRQ implementation. */ |
| 1835 | if ((retval = request_irq(dev->irq, vp->full_bus_master_rx ? | 1835 | if ((retval = request_irq(dev->irq, vp->full_bus_master_rx ? |
| 1836 | &boomerang_interrupt : &vortex_interrupt, SA_SHIRQ, dev->name, dev))) { | 1836 | &boomerang_interrupt : &vortex_interrupt, IRQF_SHARED, dev->name, dev))) { |
| 1837 | printk(KERN_ERR "%s: Could not reserve IRQ %d\n", dev->name, dev->irq); | 1837 | printk(KERN_ERR "%s: Could not reserve IRQ %d\n", dev->name, dev->irq); |
| 1838 | goto out; | 1838 | goto out; |
| 1839 | } | 1839 | } |
