aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/imx6/patches-4.3/208-sky2-allow-mac-to-come-from-dt.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2016-01-12 20:52:19 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2016-01-12 20:52:19 +0000
commitcdb83aaf5fe8de98b909d6655d6c7b9d8d2aadb2 (patch)
treeaeb91c1e1c35fc3c481922ebb7234903b6c855e8 /target/linux/imx6/patches-4.3/208-sky2-allow-mac-to-come-from-dt.patch
parent93b50ade934436d00e5f68c3feabf030ace8d98d (diff)
downloadupstream-cdb83aaf5fe8de98b909d6655d6c7b9d8d2aadb2.tar.gz
upstream-cdb83aaf5fe8de98b909d6655d6c7b9d8d2aadb2.tar.bz2
upstream-cdb83aaf5fe8de98b909d6655d6c7b9d8d2aadb2.zip
kernel/4.3: update to version 4.3.3
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de SVN-Revision: 48224
Diffstat (limited to 'target/linux/imx6/patches-4.3/208-sky2-allow-mac-to-come-from-dt.patch')
-rw-r--r--target/linux/imx6/patches-4.3/208-sky2-allow-mac-to-come-from-dt.patch8
1 files changed, 3 insertions, 5 deletions
diff --git a/target/linux/imx6/patches-4.3/208-sky2-allow-mac-to-come-from-dt.patch b/target/linux/imx6/patches-4.3/208-sky2-allow-mac-to-come-from-dt.patch
index 7a29846c25..9a94212235 100644
--- a/target/linux/imx6/patches-4.3/208-sky2-allow-mac-to-come-from-dt.patch
+++ b/target/linux/imx6/patches-4.3/208-sky2-allow-mac-to-come-from-dt.patch
@@ -1,8 +1,6 @@
-Index: linux-4.3/drivers/net/ethernet/marvell/sky2.c
-===================================================================
---- linux-4.3.orig/drivers/net/ethernet/marvell/sky2.c 2015-11-01 16:05:25.000000000 -0800
-+++ linux-4.3/drivers/net/ethernet/marvell/sky2.c 2015-12-18 10:39:44.983158318 -0800
-@@ -4812,7 +4812,24 @@
+--- a/drivers/net/ethernet/marvell/sky2.c
++++ b/drivers/net/ethernet/marvell/sky2.c
+@@ -4812,7 +4812,24 @@ static struct net_device *sky2_init_netd
* 1) from device tree data
* 2) from internal registers set by bootloader
*/