aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/pending-3.18/070-bgmac-register-napi-before-the-device.patch
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/generic/pending-3.18/070-bgmac-register-napi-before-the-device.patch')
-rw-r--r--target/linux/generic/pending-3.18/070-bgmac-register-napi-before-the-device.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/pending-3.18/070-bgmac-register-napi-before-the-device.patch b/target/linux/generic/pending-3.18/070-bgmac-register-napi-before-the-device.patch
index aa45860e93..0e7e4f8b12 100644
--- a/target/linux/generic/pending-3.18/070-bgmac-register-napi-before-the-device.patch
+++ b/target/linux/generic/pending-3.18/070-bgmac-register-napi-before-the-device.patch
@@ -13,7 +13,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
--- a/drivers/net/ethernet/broadcom/bgmac.c
+++ b/drivers/net/ethernet/broadcom/bgmac.c
-@@ -1515,6 +1515,8 @@ static int bgmac_probe(struct bcma_devic
+@@ -1521,6 +1521,8 @@ static int bgmac_probe(struct bcma_devic
if (core->bus->sprom.boardflags_lo & BGMAC_BFL_ENETADM)
bgmac_warn(bgmac, "Support for ADMtek ethernet switch not implemented\n");
@@ -22,7 +22,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
err = bgmac_mii_register(bgmac);
if (err) {
bgmac_err(bgmac, "Cannot register MDIO\n");
-@@ -1529,8 +1531,6 @@ static int bgmac_probe(struct bcma_devic
+@@ -1535,8 +1537,6 @@ static int bgmac_probe(struct bcma_devic
netif_carrier_off(net_dev);
@@ -31,7 +31,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
return 0;
err_mii_unregister:
-@@ -1549,9 +1549,9 @@ static void bgmac_remove(struct bcma_dev
+@@ -1555,9 +1555,9 @@ static void bgmac_remove(struct bcma_dev
{
struct bgmac *bgmac = bcma_get_drvdata(core);