aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx/patches-3.10/770-bgmac-phylib.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2013-10-02 22:24:01 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2013-10-02 22:24:01 +0000
commit06c8b90ebf32eacd45ff196c4c58e51ec7321868 (patch)
tree42bddd590a1d6f0a18365932658c37e660cc280b /target/linux/brcm47xx/patches-3.10/770-bgmac-phylib.patch
parent03b0c3b5a6f8c032ba10e1e1193eed1145a996c4 (diff)
downloadupstream-06c8b90ebf32eacd45ff196c4c58e51ec7321868.tar.gz
upstream-06c8b90ebf32eacd45ff196c4c58e51ec7321868.tar.bz2
upstream-06c8b90ebf32eacd45ff196c4c58e51ec7321868.zip
kernel: bgmac: move bgmac patches already applied in mainline kernel to generic
The bgmac driver will be used on the brcm47xx and the bcm53xx target. These are only the patches already applied in current net-next/master branch. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 38288
Diffstat (limited to 'target/linux/brcm47xx/patches-3.10/770-bgmac-phylib.patch')
-rw-r--r--target/linux/brcm47xx/patches-3.10/770-bgmac-phylib.patch10
1 files changed, 0 insertions, 10 deletions
diff --git a/target/linux/brcm47xx/patches-3.10/770-bgmac-phylib.patch b/target/linux/brcm47xx/patches-3.10/770-bgmac-phylib.patch
index 13a7ea5d3a..50aaeaa14d 100644
--- a/target/linux/brcm47xx/patches-3.10/770-bgmac-phylib.patch
+++ b/target/linux/brcm47xx/patches-3.10/770-bgmac-phylib.patch
@@ -1,13 +1,3 @@
---- a/drivers/net/ethernet/broadcom/Kconfig
-+++ b/drivers/net/ethernet/broadcom/Kconfig
-@@ -133,6 +133,7 @@ config BNX2X_SRIOV
- config BGMAC
- tristate "BCMA bus GBit core support"
- depends on BCMA_HOST_SOC && HAS_DMA
-+ select PHYLIB
- ---help---
- This driver supports GBit MAC and BCM4706 GBit MAC cores on BCMA bus.
- They can be found on BCM47xx SoCs and provide gigabit ethernet.
--- a/drivers/net/ethernet/broadcom/bgmac.c
+++ b/drivers/net/ethernet/broadcom/bgmac.c
@@ -1229,27 +1229,14 @@ static int bgmac_set_mac_address(struct