[kernel] generic-2.6: remove TARPIT and CHAOS patches and config options

[openwrt.git] / target / linux / generic-2.6 / patches-2.6.23 / 620-phy_adm6996.patch

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 2997392..9820d14 100644 (file)
--- 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.16/drivers/net/phy/Kconfig
-===================================================================
---- linux-2.6.23.16.orig/drivers/net/phy/Kconfig       2008-04-20 04:40:22.000000000 +0200
-+++ linux-2.6.23.16/drivers/net/phy/Kconfig    2008-04-20 04:40:32.000000000 +0200
-@@ -60,6 +60,11 @@
+--- a/drivers/net/phy/Kconfig
++++ b/drivers/net/phy/Kconfig
+@@ -60,6 +60,11 @@ config ICPLUS_PHY

        ---help---
          Currently supports the IP175C PHY.
  
        ---help---
          Currently supports the IP175C PHY.
  


@@ -14,11 +12,9 @@ Index: linux-2.6.23.16/drivers/net/phy/Kconfig
  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---

-Index: linux-2.6.23.16/drivers/net/phy/Makefile
-===================================================================
---- linux-2.6.23.16.orig/drivers/net/phy/Makefile      2008-04-20 04:40:22.000000000 +0200
-+++ linux-2.6.23.16/drivers/net/phy/Makefile   2008-04-20 04:40:32.000000000 +0200
-@@ -12,4 +12,5 @@
+--- a/drivers/net/phy/Makefile
++++ b/drivers/net/phy/Makefile
+@@ -12,4 +12,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_VITESSE_PHY)     += vitesse.o
  obj-$(CONFIG_BROADCOM_PHY)    += broadcom.o
  obj-$(CONFIG_ICPLUS_PHY)      += icplus.o