Merge branches 'topic/asoc', 'topic/misc-fixes', 'topic/ps3-csbits' and 'topic/stagin...

[karo-tx-linux.git] / drivers / watchdog / Kconfig

diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 37dc27c4ecdc7d516b9010c1b7ff2a3c144bd609..1a22fe782a27b57205a3ce21dfa1c440d84b1835 100644 (file)
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -66,6 +66,13 @@ config AT91RM9200_WATCHDOG
          Watchdog timer embedded into AT91RM9200 chips. This will reboot your
          system when the timeout is reached.
 
+config AT91SAM9X_WATCHDOG
+       tristate "AT91SAM9X watchdog"
+       depends on WATCHDOG && (ARCH_AT91SAM9260 || ARCH_AT91SAM9261)
+       help
+         Watchdog timer embedded into AT91SAM9X chips. This will reboot your
+         system when the timeout is reached.
+
 config 21285_WATCHDOG
        tristate "DC21285 watchdog"
        depends on FOOTBRIDGE
@@ -217,6 +224,15 @@ config DAVINCI_WATCHDOG
          NOTE: once enabled, this timer cannot be disabled.
          Say N if you are unsure.
 
+config ORION5X_WATCHDOG
+       tristate "Orion5x watchdog"
+       depends on ARCH_ORION5X
+       help
+         Say Y here if to include support for the watchdog timer
+         in the Orion5x ARM SoCs.
+         To compile this driver as a module, choose M here: the
+         module will be called orion5x_wdt.
+
 # ARM26 Architecture
 
 # AVR32 Architecture