[kernel] update to 2.6.26.3 and 2.6.25.16

[openwrt.git] / target / linux / adm5120 / patches / 003-adm5120_switch.patch

diff --git a/target/linux/adm5120/patches/003-adm5120_switch.patch b/target/linux/adm5120/patches/003-adm5120_switch.patch
index 6a14c2b376a037deb1dce1247e9f0771164074ce..20718119fa5bdfaf7d42a0111ccaebe791ed1520 100644 (file)
--- a/target/linux/adm5120/patches/003-adm5120_switch.patch
+++ b/target/linux/adm5120/patches/003-adm5120_switch.patch
@@ -1,8 +1,6 @@
-Index: linux-2.6.24/drivers/net/Kconfig
-===================================================================
---- linux-2.6.24.orig/drivers/net/Kconfig
-+++ linux-2.6.24/drivers/net/Kconfig
-@@ -601,6 +601,10 @@ config MIPS_AU1X00_ENET
+--- a/drivers/net/Kconfig
++++ b/drivers/net/Kconfig
+@@ -606,6 +606,10 @@
          If you have an Alchemy Semi AU1X00 based system
          say Y.  Otherwise, say N.
  
@@ -13,11 +11,9 @@ Index: linux-2.6.24/drivers/net/Kconfig
  config SGI_IOC3_ETH
        bool "SGI IOC3 Ethernet"
        depends on PCI && SGI_IP27
-Index: linux-2.6.24/drivers/net/Makefile
-===================================================================
---- linux-2.6.24.orig/drivers/net/Makefile
-+++ linux-2.6.24/drivers/net/Makefile
-@@ -183,6 +183,7 @@ obj-$(CONFIG_SC92031) += sc92031.o
+--- a/drivers/net/Makefile
++++ b/drivers/net/Makefile
+@@ -187,6 +187,7 @@
  # This is also a 82596 and should probably be merged
  obj-$(CONFIG_LP486E) += lp486e.o