aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6/patches-2.6.25/620-phy_adm6996.patch
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2008-05-30 16:30:51 +0000
committerImre Kaloz <kaloz@openwrt.org>2008-05-30 16:30:51 +0000
commit0d62d39c21daa3d3ee6f974ccf3e3ab3008d79c2 (patch)
tree5e3bc42552316a5cdaf8eee331305ff7b55c7bad /target/linux/generic-2.6/patches-2.6.25/620-phy_adm6996.patch
parent2004a63a81f73ab8d3b926815a11119b5b81c071 (diff)
downloadupstream-0d62d39c21daa3d3ee6f974ccf3e3ab3008d79c2.tar.gz
upstream-0d62d39c21daa3d3ee6f974ccf3e3ab3008d79c2.tar.bz2
upstream-0d62d39c21daa3d3ee6f974ccf3e3ab3008d79c2.zip
refresh generic 2.6.25 patches to match upstream style
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11296 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.25/620-phy_adm6996.patch')
-rw-r--r--target/linux/generic-2.6/patches-2.6.25/620-phy_adm6996.patch16
1 files changed, 6 insertions, 10 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.25/620-phy_adm6996.patch b/target/linux/generic-2.6/patches-2.6.25/620-phy_adm6996.patch
index fda414a171..46e6bf34b6 100644
--- a/target/linux/generic-2.6/patches-2.6.25/620-phy_adm6996.patch
+++ b/target/linux/generic-2.6/patches-2.6.25/620-phy_adm6996.patch
@@ -1,8 +1,6 @@
-Index: linux-2.6.25.4/drivers/net/phy/Kconfig
-===================================================================
---- linux-2.6.25.4.orig/drivers/net/phy/Kconfig
-+++ linux-2.6.25.4/drivers/net/phy/Kconfig
-@@ -65,6 +65,11 @@ config REALTEK_PHY
+--- a/drivers/net/phy/Kconfig
++++ b/drivers/net/phy/Kconfig
+@@ -65,6 +65,11 @@
---help---
Supports the Realtek 821x PHY.
@@ -14,11 +12,9 @@ Index: linux-2.6.25.4/drivers/net/phy/Kconfig
config FIXED_PHY
bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
depends on PHYLIB=y
-Index: linux-2.6.25.4/drivers/net/phy/Makefile
-===================================================================
---- linux-2.6.25.4.orig/drivers/net/phy/Makefile
-+++ linux-2.6.25.4/drivers/net/phy/Makefile
-@@ -12,6 +12,7 @@ obj-$(CONFIG_SMSC_PHY) += smsc.o
+--- a/drivers/net/phy/Makefile
++++ b/drivers/net/phy/Makefile
+@@ -12,6 +12,7 @@
obj-$(CONFIG_VITESSE_PHY) += vitesse.o
obj-$(CONFIG_BROADCOM_PHY) += broadcom.o
obj-$(CONFIG_ICPLUS_PHY) += icplus.o