diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2013-10-11 09:57:47 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2013-10-11 09:57:47 +0200 |
| commit | 04a4e1fdd248d7a19d53e6e90f757e99093e3d29 (patch) | |
| tree | ae16ad3f90d9dd726838077aae74675ba7ae51fc /drivers/net/ethernet/hp/hp100.c | |
| parent | 19e737c98479f040e23987e50596a861e5e88b92 (diff) | |
| parent | e25aa82a89db9e3b09d02b5481aa375c7712a10d (diff) | |
Merge remote-tracking branch 'wireless-next/master' into HEAD
Diffstat (limited to 'drivers/net/ethernet/hp/hp100.c')
| -rw-r--r-- | drivers/net/ethernet/hp/hp100.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/hp/hp100.c b/drivers/net/ethernet/hp/hp100.c index e3c7c697fc45..91227d03274e 100644 --- a/drivers/net/ethernet/hp/hp100.c +++ b/drivers/net/ethernet/hp/hp100.c @@ -1097,7 +1097,7 @@ static int hp100_open(struct net_device *dev) /* New: if bus is PCI or EISA, interrupts might be shared interrupts */ if (request_irq(dev->irq, hp100_interrupt, lp->bus == HP100_BUS_PCI || lp->bus == - HP100_BUS_EISA ? IRQF_SHARED : IRQF_DISABLED, + HP100_BUS_EISA ? IRQF_SHARED : 0, "hp100", dev)) { printk("hp100: %s: unable to get IRQ %d\n", dev->name, dev->irq); return -EAGAIN; |