summaryrefslogtreecommitdiff
path: root/target/linux/generic/patches-3.18/729-phy-tantos.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2014-12-22 14:37:07 +0000
committerFelix Fietkau <nbd@openwrt.org>2014-12-22 14:37:07 +0000
commit550642098095652b7454199cc98986c01057da8e (patch)
tree11e57334c617b88e69400d0d338852b95b69a578 /target/linux/generic/patches-3.18/729-phy-tantos.patch
parent7d6a7492787c16a1efbc10fc86b79b53f85da588 (diff)
downloadmtk-20170518-550642098095652b7454199cc98986c01057da8e.zip
mtk-20170518-550642098095652b7454199cc98986c01057da8e.tar.gz
mtk-20170518-550642098095652b7454199cc98986c01057da8e.tar.bz2
kernel: remove openwrt micrel.c (replaced by upstream driver)
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 43762
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.patch6
1 files changed, 3 insertions, 3 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 6262ef9..019f919 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
-@@ -292,3 +292,8 @@ endif # PHYLIB
+@@ -287,3 +287,8 @@ endif # PHYLIB
config MICREL_KS8995MA
tristate "Micrel KS8995MA 5-ports 10/100 managed Ethernet switch"
depends on SPI
@@ -11,10 +11,10 @@
+ select ETHERNET_PACKET_MANGLE
--- a/drivers/net/phy/Makefile
+++ b/drivers/net/phy/Makefile
-@@ -31,6 +31,7 @@ obj-$(CONFIG_RTL8367_PHY) += rtl8367.o
+@@ -30,6 +30,7 @@ obj-$(CONFIG_RTL8366RB_PHY) += rtl8366rb
+ 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
+obj-$(CONFIG_PSB6970_PHY) += psb6970.o
obj-$(CONFIG_FIXED_PHY) += fixed.o
obj-$(CONFIG_MDIO_BITBANG) += mdio-bitbang.o