diff options
author | Imre Kaloz <kaloz@openwrt.org> | 2015-03-26 14:06:42 +0000 |
---|---|---|
committer | Imre Kaloz <kaloz@openwrt.org> | 2015-03-26 14:06:42 +0000 |
commit | 31c9d90914816dfd51a70dd750547773fe400d11 (patch) | |
tree | e539e9d33f5f7275b1975dadac6c8f0fc7ee79a5 /target/linux/generic/patches-4.0/070-bgmac-register-fixed-PHY-for-ARM-BCM470X-BCM5301X-ch.patch | |
parent | 49fdd78bb16b1d088ee6eb610c62a2b58bd66094 (diff) | |
download | master-187ad058-31c9d90914816dfd51a70dd750547773fe400d11.tar.gz master-187ad058-31c9d90914816dfd51a70dd750547773fe400d11.tar.bz2 master-187ad058-31c9d90914816dfd51a70dd750547773fe400d11.zip |
generic/4.0: upgrade to 4.0-rc5
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45025 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-4.0/070-bgmac-register-fixed-PHY-for-ARM-BCM470X-BCM5301X-ch.patch')
-rw-r--r-- | target/linux/generic/patches-4.0/070-bgmac-register-fixed-PHY-for-ARM-BCM470X-BCM5301X-ch.patch | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/target/linux/generic/patches-4.0/070-bgmac-register-fixed-PHY-for-ARM-BCM470X-BCM5301X-ch.patch b/target/linux/generic/patches-4.0/070-bgmac-register-fixed-PHY-for-ARM-BCM470X-BCM5301X-ch.patch index 472b22b0e7..9f0baff0ee 100644 --- a/target/linux/generic/patches-4.0/070-bgmac-register-fixed-PHY-for-ARM-BCM470X-BCM5301X-ch.patch +++ b/target/linux/generic/patches-4.0/070-bgmac-register-fixed-PHY-for-ARM-BCM470X-BCM5301X-ch.patch @@ -17,8 +17,6 @@ Signed-off-by: David S. Miller <davem@davemloft.net> drivers/net/ethernet/broadcom/bgmac.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) -diff --git a/drivers/net/ethernet/broadcom/bgmac.c b/drivers/net/ethernet/broadcom/bgmac.c -index 0469f72..efda7cf 100644 --- a/drivers/net/ethernet/broadcom/bgmac.c +++ b/drivers/net/ethernet/broadcom/bgmac.c @@ -14,6 +14,7 @@ @@ -29,7 +27,7 @@ index 0469f72..efda7cf 100644 #include <linux/interrupt.h> #include <linux/dma-mapping.h> #include <bcm47xx_nvram.h> -@@ -1330,13 +1331,46 @@ static void bgmac_adjust_link(struct net_device *net_dev) +@@ -1330,13 +1331,46 @@ static void bgmac_adjust_link(struct net } } @@ -76,6 +74,3 @@ index 0469f72..efda7cf 100644 mii_bus = mdiobus_alloc(); if (!mii_bus) return -ENOMEM; --- -1.8.4.5 - |