aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.3/729-phy-tantos.patch
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2012-06-05 13:40:38 +0000
committerFlorian Fainelli <florian@openwrt.org>2012-06-05 13:40:38 +0000
commit5ec22097344e7f57a1b0e9332dd87051627cea18 (patch)
tree84f5d594c9c0e8fd9c386ea4e67774e18c682e41 /target/linux/generic/patches-3.3/729-phy-tantos.patch
parent36c99bcc428f99177480b556f20110baae7c96a7 (diff)
downloadupstream-5ec22097344e7f57a1b0e9332dd87051627cea18.tar.gz
upstream-5ec22097344e7f57a1b0e9332dd87051627cea18.tar.bz2
upstream-5ec22097344e7f57a1b0e9332dd87051627cea18.zip
refresh generic patches
SVN-Revision: 32059
Diffstat (limited to 'target/linux/generic/patches-3.3/729-phy-tantos.patch')
-rw-r--r--target/linux/generic/patches-3.3/729-phy-tantos.patch16
1 files changed, 6 insertions, 10 deletions
diff --git a/target/linux/generic/patches-3.3/729-phy-tantos.patch b/target/linux/generic/patches-3.3/729-phy-tantos.patch
index 203b3e6ab8..890d40c4d6 100644
--- a/target/linux/generic/patches-3.3/729-phy-tantos.patch
+++ b/target/linux/generic/patches-3.3/729-phy-tantos.patch
@@ -1,8 +1,6 @@
-Index: linux-3.3.7/drivers/net/phy/Kconfig
-===================================================================
---- linux-3.3.7.orig/drivers/net/phy/Kconfig 2012-05-27 18:09:00.129697447 +0200
-+++ linux-3.3.7/drivers/net/phy/Kconfig 2012-05-29 18:31:44.462611635 +0200
-@@ -207,3 +207,7 @@
+--- a/drivers/net/phy/Kconfig
++++ b/drivers/net/phy/Kconfig
+@@ -206,3 +206,7 @@ endif # PHYLIB
config MICREL_KS8995MA
tristate "Micrel KS8995MA 5-ports 10/100 managed Ethernet switch"
depends on SPI
@@ -10,11 +8,9 @@ Index: linux-3.3.7/drivers/net/phy/Kconfig
+config PSB6970_PHY
+ tristate "Lantiq XWAY Tantos (PSB6970) Ethernet switch"
+ select SWCONFIG
-Index: linux-3.3.7/drivers/net/phy/Makefile
-===================================================================
---- linux-3.3.7.orig/drivers/net/phy/Makefile 2012-05-27 18:09:00.129697447 +0200
-+++ linux-3.3.7/drivers/net/phy/Makefile 2012-05-29 18:30:59.286610634 +0200
-@@ -28,6 +28,7 @@
+--- a/drivers/net/phy/Makefile
++++ b/drivers/net/phy/Makefile
+@@ -28,6 +28,7 @@ obj-$(CONFIG_RTL8366RB_PHY) += rtl8366rb
obj-$(CONFIG_RTL8367_PHY) += rtl8367.o
obj-$(CONFIG_LSI_ET1011C_PHY) += et1011c.o
obj-$(CONFIG_MICREL_PHY) += micrel.o