diff options
author | Imre Kaloz <kaloz@openwrt.org> | 2008-06-05 17:01:00 +0000 |
---|---|---|
committer | Imre Kaloz <kaloz@openwrt.org> | 2008-06-05 17:01:00 +0000 |
commit | 2ff1596a2249657e543c0cdd7ba3b05eb33e645c (patch) | |
tree | bfeb7a11889eb81e2e7f16bcd91b913b1a124ba6 /target/linux/generic-2.6/patches-2.6.23/620-phy_adm6996.patch | |
parent | 04fd31f429a5450df483fa5178678b6de2b91e8c (diff) | |
download | upstream-2ff1596a2249657e543c0cdd7ba3b05eb33e645c.tar.gz upstream-2ff1596a2249657e543c0cdd7ba3b05eb33e645c.tar.bz2 upstream-2ff1596a2249657e543c0cdd7ba3b05eb33e645c.zip |
refresh generic 2.6.23 patches in upstream style
SVN-Revision: 11366
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.23/620-phy_adm6996.patch')
-rw-r--r-- | target/linux/generic-2.6/patches-2.6.23/620-phy_adm6996.patch | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.23/620-phy_adm6996.patch b/target/linux/generic-2.6/patches-2.6.23/620-phy_adm6996.patch index 2634ea1e71..c7aadae3ec 100644 --- a/target/linux/generic-2.6/patches-2.6.23/620-phy_adm6996.patch +++ b/target/linux/generic-2.6/patches-2.6.23/620-phy_adm6996.patch @@ -1,8 +1,6 @@ -Index: linux-2.6.23.17/drivers/net/phy/Kconfig -=================================================================== ---- linux-2.6.23.17.orig/drivers/net/phy/Kconfig -+++ linux-2.6.23.17/drivers/net/phy/Kconfig -@@ -60,6 +60,11 @@ config ICPLUS_PHY +--- a/drivers/net/phy/Kconfig ++++ b/drivers/net/phy/Kconfig +@@ -60,6 +60,11 @@ ---help--- Currently supports the IP175C PHY. @@ -14,11 +12,9 @@ Index: linux-2.6.23.17/drivers/net/phy/Kconfig config FIXED_PHY tristate "Drivers for PHY emulation on fixed speed/link" ---help--- -Index: linux-2.6.23.17/drivers/net/phy/Makefile -=================================================================== ---- linux-2.6.23.17.orig/drivers/net/phy/Makefile -+++ linux-2.6.23.17/drivers/net/phy/Makefile -@@ -12,4 +12,5 @@ obj-$(CONFIG_SMSC_PHY) += smsc.o +--- a/drivers/net/phy/Makefile ++++ b/drivers/net/phy/Makefile +@@ -12,4 +12,5 @@ obj-$(CONFIG_VITESSE_PHY) += vitesse.o obj-$(CONFIG_BROADCOM_PHY) += broadcom.o obj-$(CONFIG_ICPLUS_PHY) += icplus.o |