aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.18/720-phy_adm6996.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@openwrt.org>2014-10-27 22:55:39 +0000
committerHauke Mehrtens <hauke@openwrt.org>2014-10-27 22:55:39 +0000
commit2644af4717cf9cc3cf89564ca017f596a7dcad05 (patch)
tree7f2121f700446e60159a365094fdc6eea16d5cb7 /target/linux/generic/patches-3.18/720-phy_adm6996.patch
parent5e558fcd48c8c4acb87fe7bcf3eb2a66bb279503 (diff)
downloadupstream-2644af4717cf9cc3cf89564ca017f596a7dcad05.tar.gz
upstream-2644af4717cf9cc3cf89564ca017f596a7dcad05.tar.bz2
upstream-2644af4717cf9cc3cf89564ca017f596a7dcad05.zip
kernel: make the kernel 3.18 patches apply and boot on arm.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43095 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.18/720-phy_adm6996.patch')
-rw-r--r--target/linux/generic/patches-3.18/720-phy_adm6996.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/patches-3.18/720-phy_adm6996.patch b/target/linux/generic/patches-3.18/720-phy_adm6996.patch
index e0bdab78da..b0b8db4e5d 100644
--- a/target/linux/generic/patches-3.18/720-phy_adm6996.patch
+++ b/target/linux/generic/patches-3.18/720-phy_adm6996.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
-@@ -128,6 +128,13 @@ config MICREL_PHY
+@@ -132,6 +132,13 @@ config MICREL_PHY
---help---
Supports the KSZ9021, VSC8201, KS8001 PHYs.
@@ -16,7 +16,7 @@
depends on PHYLIB=y
--- a/drivers/net/phy/Makefile
+++ b/drivers/net/phy/Makefile
-@@ -16,6 +16,7 @@ obj-$(CONFIG_BCM63XX_PHY) += bcm63xx.o
+@@ -18,6 +18,7 @@ obj-$(CONFIG_BCM63XX_PHY) += bcm63xx.o
obj-$(CONFIG_BCM7XXX_PHY) += bcm7xxx.o
obj-$(CONFIG_BCM87XX_PHY) += bcm87xx.o
obj-$(CONFIG_ICPLUS_PHY) += icplus.o