diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-10-07 10:43:04 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-10-07 10:43:04 -0400 |
| commit | a56e74f546b64be93731e42d83baf5b538cc1b11 (patch) | |
| tree | 18f6dee45d801e57ac9db2a31664b0d5c0762c50 /drivers/net/ethernet/hp/hp100.c | |
| parent | d08e2e09042bd3f7ef66a35cb4bb92794ab26bb2 (diff) | |
| parent | e4e7f10bfc4069925e99cc4b428c3434e30b6c3f (diff) | |
Merge branch 'arm-aesbs' of git://git.linaro.org/people/ardbiesheuvel/linux-arm into devel-stable
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) | |||
| 1097 | /* New: if bus is PCI or EISA, interrupts might be shared interrupts */ | 1097 | /* New: if bus is PCI or EISA, interrupts might be shared interrupts */ |
| 1098 | if (request_irq(dev->irq, hp100_interrupt, | 1098 | if (request_irq(dev->irq, hp100_interrupt, |
| 1099 | lp->bus == HP100_BUS_PCI || lp->bus == | 1099 | lp->bus == HP100_BUS_PCI || lp->bus == |
| 1100 | HP100_BUS_EISA ? IRQF_SHARED : IRQF_DISABLED, | 1100 | HP100_BUS_EISA ? IRQF_SHARED : 0, |
| 1101 | "hp100", dev)) { | 1101 | "hp100", dev)) { |
| 1102 | printk("hp100: %s: unable to get IRQ %d\n", dev->name, dev->irq); | 1102 | printk("hp100: %s: unable to get IRQ %d\n", dev->name, dev->irq); |
| 1103 | return -EAGAIN; | 1103 | return -EAGAIN; |