aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.6/700-swconfig.patch
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2012-10-24 13:05:22 +0000
committerFlorian Fainelli <florian@openwrt.org>2012-10-24 13:05:22 +0000
commit7e856e5a97966fe89f6336783c0c676eb999e7cf (patch)
treeb5ea6efbf3f80d929729070d75c06b9a4cfe9eea /target/linux/generic/patches-3.6/700-swconfig.patch
parent4eda974038a1d09f9a73973566f72ebfd4ce556a (diff)
downloadupstream-7e856e5a97966fe89f6336783c0c676eb999e7cf.tar.gz
upstream-7e856e5a97966fe89f6336783c0c676eb999e7cf.tar.bz2
upstream-7e856e5a97966fe89f6336783c0c676eb999e7cf.zip
make all 3.6 patches apply and build
SVN-Revision: 33911
Diffstat (limited to 'target/linux/generic/patches-3.6/700-swconfig.patch')
-rw-r--r--target/linux/generic/patches-3.6/700-swconfig.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/generic/patches-3.6/700-swconfig.patch b/target/linux/generic/patches-3.6/700-swconfig.patch
index 48cb64372e..777ea95d7a 100644
--- a/target/linux/generic/patches-3.6/700-swconfig.patch
+++ b/target/linux/generic/patches-3.6/700-swconfig.patch
@@ -16,7 +16,7 @@
+
comment "MII PHY device drivers"
- config MARVELL_PHY
+ config AMD_PHY
--- a/drivers/net/phy/Makefile
+++ b/drivers/net/phy/Makefile
@@ -3,6 +3,7 @@