[kernel] refresh 2.6.26 patches

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

diff --git a/target/linux/adm5120/patches-2.6.26/310-adm5120_wdt.patch b/target/linux/adm5120/patches-2.6.26/310-adm5120_wdt.patch
index 8fded6c..f6822ec 100644 (file)
--- a/target/linux/adm5120/patches-2.6.26/310-adm5120_wdt.patch
+++ b/target/linux/adm5120/patches-2.6.26/310-adm5120_wdt.patch
@@ -1,12 +1,12 @@
 --- a/drivers/watchdog/Kconfig
 +++ b/drivers/watchdog/Kconfig
 --- a/drivers/watchdog/Kconfig
 +++ b/drivers/watchdog/Kconfig

-@@ -632,6 +632,18 @@
+@@ -632,6 +632,18 @@ config SBC_EPX_C3_WATCHDOG

  
  # MIPS Architecture
  
 +config ADM5120_WDT
 +      tristate "Infineon ADM5120 SoC hardware 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
 +      help
 +        This is a driver for hardware watchdog integrated in Infineon
 +        ADM5120 SoC. This watchdog simply watches your kernel to make sure


@@ -21,7 +21,7 @@
        depends on SGI_HAS_INDYDOG
 --- a/drivers/watchdog/Makefile
 +++ b/drivers/watchdog/Makefile
        depends on SGI_HAS_INDYDOG
 --- a/drivers/watchdog/Makefile
 +++ b/drivers/watchdog/Makefile

-@@ -91,6 +91,7 @@
+@@ -91,6 +91,7 @@ obj-$(CONFIG_SBC_EPX_C3_WATCHDOG) += sbc

  # M68KNOMMU Architecture
  
  # MIPS Architecture
  # M68KNOMMU Architecture
  
  # MIPS Architecture