[kernel] update to 2.6.26.3 and 2.6.25.16

[openwrt.git] / target / linux / adm5120 / patches / 310-adm5120_wdt.patch

diff --git a/target/linux/adm5120/patches/310-adm5120_wdt.patch b/target/linux/adm5120/patches/310-adm5120_wdt.patch
index 27292434667ffffdcdce72dc978e3ad4193a9663..78eb62862db2a6b36819f0cbb2f9c4fd64614cef 100644 (file)
--- a/target/linux/adm5120/patches/310-adm5120_wdt.patch
+++ b/target/linux/adm5120/patches/310-adm5120_wdt.patch
@@ -1,8 +1,6 @@
-Index: linux-2.6.24.7/drivers/watchdog/Kconfig
-===================================================================
---- linux-2.6.24.7.orig/drivers/watchdog/Kconfig
-+++ linux-2.6.24.7/drivers/watchdog/Kconfig
-@@ -607,6 +607,18 @@ config SBC_EPX_C3_WATCHDOG
+--- a/drivers/watchdog/Kconfig
++++ b/drivers/watchdog/Kconfig
+@@ -619,6 +619,18 @@
  
  # MIPS Architecture
  
@@ -20,12 +18,10 @@ Index: linux-2.6.24.7/drivers/watchdog/Kconfig
 +
  config INDYDOG
        tristate "Indy/I2 Hardware Watchdog"
-       depends on SGI_IP22
-Index: linux-2.6.24.7/drivers/watchdog/Makefile
-===================================================================
---- linux-2.6.24.7.orig/drivers/watchdog/Makefile
-+++ linux-2.6.24.7/drivers/watchdog/Makefile
-@@ -89,6 +89,7 @@ obj-$(CONFIG_SBC_EPX_C3_WATCHDOG) += sbc
+       depends on SGI_HAS_INDYDOG
+--- a/drivers/watchdog/Makefile
++++ b/drivers/watchdog/Makefile
+@@ -90,6 +90,7 @@
  # M68KNOMMU Architecture
  
  # MIPS Architecture