diff options
| author | guoyin.chen <guoyin.chen@freescale.com> | 2013-04-07 13:56:21 +0800 |
|---|---|---|
| committer | guoyin.chen <guoyin.chen@freescale.com> | 2013-04-07 13:56:21 +0800 |
| commit | ea6aa41b21de5095d17d43776c8a8c472fad9cd4 (patch) | |
| tree | b7e245793e9306d8f602c87a90c76bd0b2e7be1e /drivers | |
| parent | 7c8718a8d86182a1ea3ad6d89e2ff0201ca2a4a9 (diff) | |
| parent | 23fae65a58952ca3de64e68c13c0d3527bec6f0a (diff) | |
Merge remote-tracking branch 'fsl-linux-sdk/imx_3.0.35_4.0.0' into imx_3.0.35_android
Diffstat (limited to 'drivers')
| -rwxr-xr-x | drivers/net/fec.c | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/drivers/net/fec.c b/drivers/net/fec.c index ebb09eb9a6f2..69e4a57ed51b 100755 --- a/drivers/net/fec.c +++ b/drivers/net/fec.c @@ -27,7 +27,6 @@ #include <linux/string.h> #include <linux/ptrace.h> #include <linux/errno.h> -#include <linux/gpio.h> #include <linux/ioport.h> #include <linux/slab.h> #include <linux/interrupt.h> @@ -1873,17 +1872,6 @@ fec_probe(struct platform_device *pdev) if (pdata) fep->phy_interface = pdata->phy; -#ifdef CONFIG_MX6_ENET_IRQ_TO_GPIO - gpio_request(pdata->gpio_irq, "gpio_enet_irq"); - gpio_direction_input(pdata->gpio_irq); - - irq = gpio_to_irq(pdata->gpio_irq); - ret = request_irq(irq, fec_enet_interrupt, - IRQF_TRIGGER_RISING, - pdev->name, ndev); - if (ret) - goto failed_irq; -#else /* This device has up to three irqs on some platforms */ for (i = 0; i < 3; i++) { irq = platform_get_irq(pdev, i); @@ -1898,7 +1886,6 @@ fec_probe(struct platform_device *pdev) goto failed_irq; } } -#endif fep->clk = clk_get(&pdev->dev, "fec_clk"); if (IS_ERR(fep->clk)) { @@ -1949,15 +1936,11 @@ failed_init: clk_disable(fep->clk); clk_put(fep->clk); failed_clk: -#ifdef CONFIG_MX6_ENET_IRQ_TO_GPIO - free_irq(irq, ndev); -#else for (i = 0; i < 3; i++) { irq = platform_get_irq(pdev, i); if (irq > 0) free_irq(irq, ndev); } -#endif failed_irq: iounmap(fep->hwp); failed_ioremap: |