aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6/patches-2.6.22/999-icplus.patch
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2008-05-18 20:24:13 +0000
committerGabor Juhos <juhosg@openwrt.org>2008-05-18 20:24:13 +0000
commit7d8b70a1ece7a0f5078688e2ccd4b11e4444d3fe (patch)
tree2c3e3d4268c3d9f5742e872e32686ebfebd970d4 /target/linux/generic-2.6/patches-2.6.22/999-icplus.patch
parent6761ddd557729c97c12d19832c70e279839b4d5d (diff)
downloadupstream-7d8b70a1ece7a0f5078688e2ccd4b11e4444d3fe.tar.gz
upstream-7d8b70a1ece7a0f5078688e2ccd4b11e4444d3fe.tar.bz2
upstream-7d8b70a1ece7a0f5078688e2ccd4b11e4444d3fe.zip
refresh generic 2.6.22 patches
SVN-Revision: 11186
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.22/999-icplus.patch')
-rw-r--r--target/linux/generic-2.6/patches-2.6.22/999-icplus.patch23
1 files changed, 11 insertions, 12 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.22/999-icplus.patch b/target/linux/generic-2.6/patches-2.6.22/999-icplus.patch
index 2437e7ba9d..599fab1081 100644
--- a/target/linux/generic-2.6/patches-2.6.22/999-icplus.patch
+++ b/target/linux/generic-2.6/patches-2.6.22/999-icplus.patch
@@ -14,10 +14,10 @@ Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
---
-diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig
-index 09b6f25..dd09011 100644
---- a/drivers/net/phy/Kconfig
-+++ b/drivers/net/phy/Kconfig
+Index: linux-2.6.22.19/drivers/net/phy/Kconfig
+===================================================================
+--- linux-2.6.22.19.orig/drivers/net/phy/Kconfig
++++ linux-2.6.22.19/drivers/net/phy/Kconfig
@@ -55,6 +55,11 @@ config BROADCOM_PHY
---help---
Currently supports the BCM5411, BCM5421 and BCM5461 PHYs.
@@ -30,21 +30,20 @@ index 09b6f25..dd09011 100644
config FIXED_PHY
tristate "Drivers for PHY emulation on fixed speed/link"
---help---
-diff --git a/drivers/net/phy/Makefile b/drivers/net/phy/Makefile
-index bcd1efb..8885650 100644
---- a/drivers/net/phy/Makefile
-+++ b/drivers/net/phy/Makefile
+Index: linux-2.6.22.19/drivers/net/phy/Makefile
+===================================================================
+--- linux-2.6.22.19.orig/drivers/net/phy/Makefile
++++ linux-2.6.22.19/drivers/net/phy/Makefile
@@ -11,4 +11,5 @@ obj-$(CONFIG_QSEMI_PHY) += qsemi.o
obj-$(CONFIG_SMSC_PHY) += smsc.o
obj-$(CONFIG_VITESSE_PHY) += vitesse.o
obj-$(CONFIG_BROADCOM_PHY) += broadcom.o
+obj-$(CONFIG_ICPLUS_PHY) += icplus.o
obj-$(CONFIG_FIXED_PHY) += fixed.o
-diff --git a/drivers/net/phy/icplus.c b/drivers/net/phy/icplus.c
-new file mode 100644
-index 0000000..af3f1f2
+Index: linux-2.6.22.19/drivers/net/phy/icplus.c
+===================================================================
--- /dev/null
-+++ b/drivers/net/phy/icplus.c
++++ linux-2.6.22.19/drivers/net/phy/icplus.c
@@ -0,0 +1,134 @@
+/*
+ * Driver for ICPlus PHYs