summaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.18/729-phy-tantos.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2014-10-27 22:55:39 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2014-10-27 22:55:39 +0000
commita76ee3b1d5dee92a13ba357e9baf2ad155976604 (patch)
tree38745103e28135d9d7fc5fbfbc64a5eb7f6f49d3 /target/linux/generic/patches-3.18/729-phy-tantos.patch
parentcea2b5299b13fcfef7de2f194e833e545e9e0f2f (diff)
downloadmaster-31e0f0ae-a76ee3b1d5dee92a13ba357e9baf2ad155976604.tar.gz
master-31e0f0ae-a76ee3b1d5dee92a13ba357e9baf2ad155976604.tar.bz2
master-31e0f0ae-a76ee3b1d5dee92a13ba357e9baf2ad155976604.zip
kernel: make the kernel 3.18 patches apply and boot on arm.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 43095
Diffstat (limited to 'target/linux/generic/patches-3.18/729-phy-tantos.patch')
-rw-r--r--target/linux/generic/patches-3.18/729-phy-tantos.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/patches-3.18/729-phy-tantos.patch b/target/linux/generic/patches-3.18/729-phy-tantos.patch
index 4fab9b80a9..6262ef9803 100644
--- a/target/linux/generic/patches-3.18/729-phy-tantos.patch
+++ b/target/linux/generic/patches-3.18/729-phy-tantos.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
-@@ -288,3 +288,8 @@ endif # PHYLIB
+@@ -292,3 +292,8 @@ endif # PHYLIB
config MICREL_KS8995MA
tristate "Micrel KS8995MA 5-ports 10/100 managed Ethernet switch"
depends on SPI
@@ -11,7 +11,7 @@
+ select ETHERNET_PACKET_MANGLE
--- a/drivers/net/phy/Makefile
+++ b/drivers/net/phy/Makefile
-@@ -29,6 +29,7 @@ obj-$(CONFIG_RTL8367_PHY) += rtl8367.o
+@@ -31,6 +31,7 @@ obj-$(CONFIG_RTL8367_PHY) += rtl8367.o
obj-$(CONFIG_RTL8367B_PHY) += rtl8367b.o
obj-$(CONFIG_LSI_ET1011C_PHY) += et1011c.o
obj-$(CONFIG_MICREL_PHY) += micrel.o