diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2014-12-22 14:37:07 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2014-12-22 14:37:07 +0000 |
| commit | 62477818bb7022372aaa74634a51a8dddd7c7204 (patch) | |
| tree | de042f817d85641e0d8a4be7fdb2db87e8516db8 /target/linux/generic/patches-3.18 | |
| parent | 0a6a5169d801824b824490463f3cbd4410fbc1c8 (diff) | |
| download | upstream-62477818bb7022372aaa74634a51a8dddd7c7204.tar.gz upstream-62477818bb7022372aaa74634a51a8dddd7c7204.tar.bz2 upstream-62477818bb7022372aaa74634a51a8dddd7c7204.zip | |
kernel: remove openwrt micrel.c (replaced by upstream driver)
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43762 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.18')
| -rw-r--r-- | target/linux/generic/patches-3.18/728-phy-micrel.patch | 24 | ||||
| -rw-r--r-- | target/linux/generic/patches-3.18/728-phy-rtl8367b.patch (renamed from target/linux/generic/patches-3.18/729-phy-rtl8367b.patch) | 4 | ||||
| -rw-r--r-- | target/linux/generic/patches-3.18/729-phy-tantos.patch | 6 | ||||
| -rw-r--r-- | target/linux/generic/patches-3.18/730-phy_b53.patch | 6 |
4 files changed, 8 insertions, 32 deletions
diff --git a/target/linux/generic/patches-3.18/728-phy-micrel.patch b/target/linux/generic/patches-3.18/728-phy-micrel.patch deleted file mode 100644 index 95199a4348..0000000000 --- a/target/linux/generic/patches-3.18/728-phy-micrel.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- a/drivers/net/phy/Kconfig -+++ b/drivers/net/phy/Kconfig -@@ -156,6 +156,11 @@ config RTL8306_PHY - tristate "Driver for Realtek RTL8306S switches" - select SWCONFIG - -+config MICREL_PHY -+ tristate "Drivers for Micrel/Kendin PHYs" -+ ---help--- -+ Currently has a driver for the KSZ8041 -+ - config FIXED_PHY - bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs" - depends on PHYLIB=y ---- a/drivers/net/phy/Makefile -+++ b/drivers/net/phy/Makefile -@@ -29,6 +29,7 @@ obj-$(CONFIG_RTL8366S_PHY) += rtl8366s.o - obj-$(CONFIG_RTL8366RB_PHY) += rtl8366rb.o - obj-$(CONFIG_RTL8367_PHY) += rtl8367.o - obj-$(CONFIG_LSI_ET1011C_PHY) += et1011c.o -+obj-$(CONFIG_MICREL_PHY) += micrel.o - obj-$(CONFIG_FIXED_PHY) += fixed.o - obj-$(CONFIG_MDIO_BITBANG) += mdio-bitbang.o - obj-$(CONFIG_MDIO_GPIO) += mdio-gpio.o diff --git a/target/linux/generic/patches-3.18/729-phy-rtl8367b.patch b/target/linux/generic/patches-3.18/728-phy-rtl8367b.patch index cc4f7940d2..958ff58907 100644 --- a/target/linux/generic/patches-3.18/729-phy-rtl8367b.patch +++ b/target/linux/generic/patches-3.18/728-phy-rtl8367b.patch @@ -1,6 +1,6 @@ --- a/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig -@@ -281,6 +281,10 @@ config RTL8367_PHY +@@ -276,6 +276,10 @@ config RTL8367_PHY tristate "Driver for the Realtek RTL8367R/M switches" select SWCONFIG @@ -19,5 +19,5 @@ 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_FIXED_PHY) += fixed.o + obj-$(CONFIG_MDIO_BITBANG) += mdio-bitbang.o 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 6262ef9803..019f919492 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 diff --git a/target/linux/generic/patches-3.18/730-phy_b53.patch b/target/linux/generic/patches-3.18/730-phy_b53.patch index 5e13797630..c2dfcfa501 100644 --- a/target/linux/generic/patches-3.18/730-phy_b53.patch +++ b/target/linux/generic/patches-3.18/730-phy_b53.patch @@ -1,6 +1,6 @@ --- a/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig -@@ -287,6 +287,8 @@ config RTL8367B_PHY +@@ -282,6 +282,8 @@ config RTL8367B_PHY endif # RTL8366_SMI @@ -11,9 +11,9 @@ config MICREL_KS8995MA --- a/drivers/net/phy/Makefile +++ b/drivers/net/phy/Makefile -@@ -32,6 +32,7 @@ obj-$(CONFIG_RTL8367B_PHY) += rtl8367b.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 obj-$(CONFIG_PSB6970_PHY) += psb6970.o +obj-$(CONFIG_B53) += b53/ obj-$(CONFIG_FIXED_PHY) += fixed.o |