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/dec/tulip/de4x5.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/dec/tulip/de4x5.c')
| -rw-r--r-- | drivers/net/ethernet/dec/tulip/de4x5.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/dec/tulip/de4x5.c b/drivers/net/ethernet/dec/tulip/de4x5.c index 2db6c573cec7..263b92c00cbf 100644 --- a/drivers/net/ethernet/dec/tulip/de4x5.c +++ b/drivers/net/ethernet/dec/tulip/de4x5.c | |||
| @@ -1321,7 +1321,7 @@ de4x5_open(struct net_device *dev) | |||
| 1321 | if (request_irq(dev->irq, de4x5_interrupt, IRQF_SHARED, | 1321 | if (request_irq(dev->irq, de4x5_interrupt, IRQF_SHARED, |
| 1322 | lp->adapter_name, dev)) { | 1322 | lp->adapter_name, dev)) { |
| 1323 | printk("de4x5_open(): Requested IRQ%d is busy - attemping FAST/SHARE...", dev->irq); | 1323 | printk("de4x5_open(): Requested IRQ%d is busy - attemping FAST/SHARE...", dev->irq); |
| 1324 | if (request_irq(dev->irq, de4x5_interrupt, IRQF_DISABLED | IRQF_SHARED, | 1324 | if (request_irq(dev->irq, de4x5_interrupt, IRQF_SHARED, |
| 1325 | lp->adapter_name, dev)) { | 1325 | lp->adapter_name, dev)) { |
| 1326 | printk("\n Cannot get IRQ- reconfigure your hardware.\n"); | 1326 | printk("\n Cannot get IRQ- reconfigure your hardware.\n"); |
| 1327 | disable_ast(dev); | 1327 | disable_ast(dev); |