refresh generic 2.6.22 patches

[openwrt.git] / target / linux / generic-2.6 / patches-2.6.22 / 999-icplus.patch

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 2437e7b..d38df05 100644 (file)
--- 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,11 +14,9 @@ Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
 Signed-off-by: Jeff Garzik <jeff@garzik.org>
 ---
 
 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
 --- a/drivers/net/phy/Kconfig
 +++ b/drivers/net/phy/Kconfig

-@@ -55,6 +55,11 @@ config BROADCOM_PHY
+@@ -55,6 +55,11 @@

        ---help---
          Currently supports the BCM5411, BCM5421 and BCM5461 PHYs.
  
        ---help---
          Currently supports the BCM5411, BCM5421 and BCM5461 PHYs.
  


@@ -30,19 +28,14 @@ index 09b6f25..dd09011 100644
  config FIXED_PHY
        tristate "Drivers for PHY emulation on fixed speed/link"
        ---help---
  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
 --- a/drivers/net/phy/Makefile
 +++ b/drivers/net/phy/Makefile

-@@ -11,4 +11,5 @@ obj-$(CONFIG_QSEMI_PHY)              += qsemi.o
+@@ -11,4 +11,5 @@

  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
  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

 --- /dev/null
 +++ b/drivers/net/phy/icplus.c
 @@ -0,0 +1,134 @@
 --- /dev/null
 +++ b/drivers/net/phy/icplus.c
 @@ -0,0 +1,134 @@