Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / drivers / watchdog / Kconfig

diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 4a3907fc8a5b1aa12bad006db5e4c4d0ed196b65..4a4a356d0ef9f223529e60c6fc0647b10e958b93 100644 (file)
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -223,7 +223,7 @@ config DAVINCI_WATCHDOG
 
 config AT32AP700X_WDT
        tristate "AT32AP700x watchdog"
 
 config AT32AP700X_WDT
        tristate "AT32AP700x watchdog"

-       depends on CPU_AT32AP7000
+       depends on CPU_AT32AP700X

        help
          Watchdog timer embedded into AT32AP700x devices. This will reboot
          your system when the timeout is reached.
        help
          Watchdog timer embedded into AT32AP700x devices. This will reboot
          your system when the timeout is reached.


@@ -609,7 +609,7 @@ config SBC_EPX_C3_WATCHDOG
 
 config INDYDOG
        tristate "Indy/I2 Hardware Watchdog"
 
 config INDYDOG
        tristate "Indy/I2 Hardware Watchdog"

-       depends on SGI_IP22
+       depends on SGI_HAS_INDYDOG

        help
          Hardware driver for the Indy's/I2's watchdog. This is a
          watchdog timer that will reboot the machine after a 60 second
        help
          Hardware driver for the Indy's/I2's watchdog. This is a
          watchdog timer that will reboot the machine after a 60 second


@@ -639,6 +639,12 @@ config AR7_WDT
        help
          Hardware driver for the TI AR7 Watchdog Timer.
 
        help
          Hardware driver for the TI AR7 Watchdog Timer.
 

+config TXX9_WDT
+       tristate "Toshiba TXx9 Watchdog Timer"
+       depends on CPU_TX39XX || CPU_TX49XX
+       help
+         Hardware driver for the built-in watchdog timer on TXx9 MIPS SoCs.
+

 # PARISC Architecture
 
 # POWERPC Architecture
 # PARISC Architecture
 
 # POWERPC Architecture