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 ec68c741b5645eddd206df2a02b492b3ee783650..09a3d5522b43d9a2b6d00f3612f6c88c516068ae 100644 (file)
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -187,10 +187,10 @@ config EP93XX_WATCHDOG
 
 config OMAP_WATCHDOG
        tristate "OMAP Watchdog"
-       depends on ARCH_OMAP16XX || ARCH_OMAP24XX
+       depends on ARCH_OMAP16XX || ARCH_OMAP24XX || ARCH_OMAP34XX
        help
-         Support for TI OMAP1610/OMAP1710/OMAP2420 watchdog.  Say 'Y' here to
-         enable the OMAP1610/OMAP1710 watchdog timer.
+         Support for TI OMAP1610/OMAP1710/OMAP2420/OMAP3430 watchdog.  Say 'Y'
+         here to enable the OMAP1610/OMAP1710/OMAP2420/OMAP3430 watchdog timer.
 
 config PNX4008_WATCHDOG
        tristate "PNX4008 Watchdog"
@@ -770,6 +770,12 @@ config TXX9_WDT
 
 # POWERPC Architecture
 
+config GEF_WDT
+       tristate "GE Fanuc Watchdog Timer"
+       depends on GEF_SBC610
+       ---help---
+         Watchdog timer found in a number of GE Fanuc single board computers.
+
 config MPC5200_WDT
        tristate "MPC5200 Watchdog Timer"
        depends on PPC_MPC52xx
@@ -790,6 +796,14 @@ config MV64X60_WDT
        tristate "MV64X60 (Marvell Discovery) Watchdog Timer"
        depends on MV64X60
 
+config PIKA_WDT
+       tristate "PIKA FPGA Watchdog"
+       depends on WARP
+       default y
+       help
+         This enables the watchdog in the PIKA FPGA. Currently used on
+         the Warp platform.
+
 config BOOKE_WDT
        bool "PowerPC Book-E Watchdog Timer"
        depends on BOOKE || 4xx