agp: remove flush_agp_mappings calls from new flush handling code

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

diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 2792bc1a726991b7b3dbf0046ad1e2d2dd6b313b..afcdc69e37d6cadc6eee4b2cc9b6e45b47f37bc0 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.


@@ -392,6 +392,16 @@ config ITCO_VENDOR_SUPPORT
          devices. At this moment we only have additional support for some
          SuperMicro Inc. motherboards.
 
          devices. At this moment we only have additional support for some
          SuperMicro Inc. motherboards.
 

+config IT8712F_WDT
+       tristate "IT8712F (Smart Guardian) Watchdog Timer"
+       depends on X86
+       ---help---
+         This is the driver for the built-in watchdog timer on the IT8712F
+         Super I/0 chipset used on many motherboards.
+
+         To compile this driver as a module, choose M here: the
+         module will be called it8712f_wdt.
+

 config SC1200_WDT
        tristate "National Semiconductor PC87307/PC97307 (ala SC1200) Watchdog"
        depends on X86
 config SC1200_WDT
        tristate "National Semiconductor PC87307/PC97307 (ala SC1200) Watchdog"
        depends on X86


@@ -456,6 +466,19 @@ config SBC8360_WDT
 
          Most people will say N.
 
 
          Most people will say N.
 

+config SBC7240_WDT
+       tristate "SBC Nano 7240 Watchdog Timer"
+       depends on X86_32
+       ---help---
+         This is the driver for the hardware watchdog found on the IEI
+         single board computers EPIC Nano 7240 (and likely others). This
+         watchdog simply watches your kernel to make sure it doesn't freeze,
+         and if it does, it reboots your computer after a certain amount of
+         time.
+
+         To compile this driver as a module, choose M here: the
+         module will be called sbc7240_wdt.
+

 config CPU5_WDT
        tristate "SMA CPU5 Watchdog"
        depends on X86
 config CPU5_WDT
        tristate "SMA CPU5 Watchdog"
        depends on X86


@@ -586,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


@@ -616,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