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/freescale/fec_main.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/freescale/fec_main.c')
| -rw-r--r-- | drivers/net/ethernet/freescale/fec_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c index f9aacf5d8523..b2793b91cc55 100644 --- a/drivers/net/ethernet/freescale/fec_main.c +++ b/drivers/net/ethernet/freescale/fec_main.c | |||
| @@ -2199,7 +2199,7 @@ fec_probe(struct platform_device *pdev) | |||
| 2199 | goto failed_irq; | 2199 | goto failed_irq; |
| 2200 | } | 2200 | } |
| 2201 | ret = devm_request_irq(&pdev->dev, irq, fec_enet_interrupt, | 2201 | ret = devm_request_irq(&pdev->dev, irq, fec_enet_interrupt, |
| 2202 | IRQF_DISABLED, pdev->name, ndev); | 2202 | 0, pdev->name, ndev); |
| 2203 | if (ret) | 2203 | if (ret) |
| 2204 | goto failed_irq; | 2204 | goto failed_irq; |
| 2205 | } | 2205 | } |