diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2017-11-12 23:06:30 +0100 |
---|---|---|
committer | Mathias Kresin <dev@kresin.me> | 2018-02-20 19:25:17 +0100 |
commit | f1d84023cb38d9159d3f5bcf290dd100ca724690 (patch) | |
tree | c61445e2c8623154bc7884e7b87629c8f43e6dcb /target/linux/lantiq/patches-4.14/0035-owrt-lantiq-wifi-and-ethernet-eeprom-handling.patch | |
parent | 5eeaba31b8fad26d6ed0f1b52a7f156d838326b8 (diff) | |
download | upstream-f1d84023cb38d9159d3f5bcf290dd100ca724690.tar.gz upstream-f1d84023cb38d9159d3f5bcf290dd100ca724690.tar.bz2 upstream-f1d84023cb38d9159d3f5bcf290dd100ca724690.zip |
lantiq: kernel 4.14: update patches and config
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: Mathias Kresin <dev@kresin.me>
Diffstat (limited to 'target/linux/lantiq/patches-4.14/0035-owrt-lantiq-wifi-and-ethernet-eeprom-handling.patch')
-rw-r--r-- | target/linux/lantiq/patches-4.14/0035-owrt-lantiq-wifi-and-ethernet-eeprom-handling.patch | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/target/linux/lantiq/patches-4.14/0035-owrt-lantiq-wifi-and-ethernet-eeprom-handling.patch b/target/linux/lantiq/patches-4.14/0035-owrt-lantiq-wifi-and-ethernet-eeprom-handling.patch index a5ecd94c4a..2e0ce468f0 100644 --- a/target/linux/lantiq/patches-4.14/0035-owrt-lantiq-wifi-and-ethernet-eeprom-handling.patch +++ b/target/linux/lantiq/patches-4.14/0035-owrt-lantiq-wifi-and-ethernet-eeprom-handling.patch @@ -27,14 +27,13 @@ Signed-off-by: John Crispin <blogic@openwrt.org> #endif /* _LTQ_XWAY_H__ */ --- a/arch/mips/lantiq/xway/Makefile +++ b/arch/mips/lantiq/xway/Makefile -@@ -8,4 +8,7 @@ endif +@@ -7,3 +7,6 @@ obj-y += timer.o + endif obj-y += vmmc.o - ++ +obj-y += eth_mac.o +obj-$(CONFIG_PCI) += ath5k_eep.o -+ - obj-$(CONFIG_XRX200_PHY_FW) += xrx200_phy_fw.o --- /dev/null +++ b/arch/mips/lantiq/xway/ath5k_eep.c @@ -0,0 +1,136 @@ @@ -204,7 +203,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> +early_param("ethaddr", setup_ethaddr); --- a/drivers/net/ethernet/lantiq_etop.c +++ b/drivers/net/ethernet/lantiq_etop.c -@@ -794,7 +794,11 @@ ltq_etop_init(struct net_device *dev) +@@ -783,7 +783,11 @@ ltq_etop_init(struct net_device *dev) if (err) goto err_hw; |