[8.09] kernel: refresh patches

[openwrt/svn-archive/archive.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 2f1ac5387a380dbef3e5e9af9a2c16c09b937b53..f6822ecd318ac8fa29df95f5c769a1d08b1ed98a 100644 (file)
--- a/target/linux/adm5120/patches/310-adm5120_wdt.patch
+++ b/target/linux/adm5120/patches/310-adm5120_wdt.patch
@@ -1,14 +1,12 @@
-Index: linux-2.6.24/drivers/watchdog/Kconfig
-===================================================================
---- linux-2.6.24.orig/drivers/watchdog/Kconfig
-+++ linux-2.6.24/drivers/watchdog/Kconfig
-@@ -607,6 +607,18 @@ config SBC_EPX_C3_WATCHDOG
+--- a/drivers/watchdog/Kconfig
++++ b/drivers/watchdog/Kconfig
+@@ -632,6 +632,18 @@ config SBC_EPX_C3_WATCHDOG
  
  # MIPS Architecture
  
 +config ADM5120_WDT
 +      tristate "Infineon ADM5120 SoC hardware watchdog"
-+      depends on WATCHDOG && MIPS_ADM5120
++      depends on WATCHDOG && ADM5120
 +      help
 +        This is a driver for hardware watchdog integrated in Infineon
 +        ADM5120 SoC. This watchdog simply watches your kernel to make sure
@@ -20,12 +18,10 @@ Index: linux-2.6.24/drivers/watchdog/Kconfig
 +
  config INDYDOG
        tristate "Indy/I2 Hardware Watchdog"
-       depends on SGI_IP22
-Index: linux-2.6.24/drivers/watchdog/Makefile
-===================================================================
---- linux-2.6.24.orig/drivers/watchdog/Makefile
-+++ linux-2.6.24/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
+@@ -91,6 +91,7 @@ obj-$(CONFIG_SBC_EPX_C3_WATCHDOG) += sbc
  # M68KNOMMU Architecture
  
  # MIPS Architecture