aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ipq40xx/patches-5.4/705-net-add-qualcomm-ar40xx-phy.patch
diff options
context:
space:
mode:
authorJohn Audia <graysky@archlinux.us>2021-12-29 10:23:53 -0500
committerHauke Mehrtens <hauke@hauke-m.de>2022-01-03 01:00:03 +0100
commit7bf62e2451100620925b66dfee9c0a97dfbab90e (patch)
treed274ecbe514b5f2fbdd7123aef96a9a0c3b185bc /target/linux/ipq40xx/patches-5.4/705-net-add-qualcomm-ar40xx-phy.patch
parentd9c2b0cfdd1c8a377c7fa67e34437a726cf16d08 (diff)
downloadupstream-7bf62e2451100620925b66dfee9c0a97dfbab90e.tar.gz
upstream-7bf62e2451100620925b66dfee9c0a97dfbab90e.tar.bz2
upstream-7bf62e2451100620925b66dfee9c0a97dfbab90e.zip
kernel: bump 5.4 to 5.4.169
All patches automatically rebased. Build system: x86_64 Build-tested: ramips/mt7621* *Had to revert 7f1edbd in order to build due to FS#4149 Signed-off-by: John Audia <graysky@archlinux.us>
Diffstat (limited to 'target/linux/ipq40xx/patches-5.4/705-net-add-qualcomm-ar40xx-phy.patch')
-rw-r--r--target/linux/ipq40xx/patches-5.4/705-net-add-qualcomm-ar40xx-phy.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/ipq40xx/patches-5.4/705-net-add-qualcomm-ar40xx-phy.patch b/target/linux/ipq40xx/patches-5.4/705-net-add-qualcomm-ar40xx-phy.patch
index 9adddcabc3..6315a81527 100644
--- a/target/linux/ipq40xx/patches-5.4/705-net-add-qualcomm-ar40xx-phy.patch
+++ b/target/linux/ipq40xx/patches-5.4/705-net-add-qualcomm-ar40xx-phy.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
-@@ -584,6 +584,13 @@ config XILINX_GMII2RGMII
+@@ -580,6 +580,13 @@ config XILINX_GMII2RGMII
the Reduced Gigabit Media Independent Interface(RGMII) between
Ethernet physical media devices and the Gigabit Ethernet controller.
@@ -16,7 +16,7 @@
config MICREL_KS8995MA
--- a/drivers/net/phy/Makefile
+++ b/drivers/net/phy/Makefile
-@@ -69,6 +69,7 @@ ifdef CONFIG_HWMON
+@@ -68,6 +68,7 @@ ifdef CONFIG_HWMON
aquantia-objs += aquantia_hwmon.o
endif
obj-$(CONFIG_AQUANTIA_PHY) += aquantia.o