iwmc3200wifi: Test of wrong pointer after kzalloc in iwm_mlme_update_bss_table()

[safe/jmp/linux-2.6] / drivers / watchdog / Kconfig

diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 373c22f..3711b88 100644 (file)
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -55,6 +55,13 @@ config SOFT_WATCHDOG
          To compile this driver as a module, choose M here: the
          module will be called softdog.
 
+config WM831X_WATCHDOG
+       tristate "WM831x watchdog"
+       depends on MFD_WM831X
+       help
+         Support for the watchdog in the WM831x AudioPlus PMICs.  When
+         the watchdog triggers the system will be reset.
+
 config WM8350_WATCHDOG
        tristate "WM8350 watchdog"
        depends on MFD_WM8350
@@ -240,6 +247,48 @@ config ORION_WATCHDOG
          To compile this driver as a module, choose M here: the
          module will be called orion_wdt.
 
+config COH901327_WATCHDOG
+       bool "ST-Ericsson COH 901 327 watchdog"
+       depends on ARCH_U300
+       default y if MACH_U300
+       help
+         Say Y here to include Watchdog timer support for the
+         watchdog embedded into the ST-Ericsson U300 series platforms.
+         This watchdog is used to reset the system and thus cannot be
+         compiled as a module.
+
+config TWL4030_WATCHDOG
+       tristate "TWL4030 Watchdog"
+       depends on TWL4030_CORE
+       help
+         Support for TI TWL4030 watchdog.  Say 'Y' here to enable the
+         watchdog timer support for TWL4030 chips.
+
+config STMP3XXX_WATCHDOG
+       tristate "Freescale STMP3XXX watchdog"
+       depends on ARCH_STMP3XXX
+       help
+         Say Y here if to include support for the watchdog timer
+         for the Sigmatel STMP37XX/378X SoC.
+         To compile this driver as a module, choose M here: the
+         module will be called stmp3xxx_wdt.
+
+config NUC900_WATCHDOG
+       tristate "Nuvoton NUC900 watchdog"
+       depends on ARCH_W90X900
+       help
+         Say Y here if to include support for the watchdog timer
+         for the Nuvoton NUC900 series SoCs.
+         To compile this driver as a module, choose M here: the
+         module will be called nuc900_wdt.
+
+config ADX_WATCHDOG
+       tristate "Avionic Design Xanthos watchdog"
+       depends on ARCH_PXA_ADX
+       help
+         Say Y here if you want support for the watchdog timer on Avionic
+         Design Xanthos boards.
+
 # AVR32 Architecture
 
 config AT32AP700X_WDT
@@ -343,6 +392,28 @@ config SC520_WDT
          You can compile this driver directly into the kernel, or use
          it as a module.  The module will be called sc520_wdt.
 
+config SBC_FITPC2_WATCHDOG
+       tristate "Compulab SBC-FITPC2 watchdog"
+       depends on X86
+       ---help---
+         This is the driver for the built-in watchdog timer on the fit-PC2
+         Single-board computer made by Compulab.
+
+         It`s possible to enable watchdog timer either from BIOS (F2) or from booted Linux.
+         When "Watchdog Timer Value" enabled one can set 31-255 s operational range.
+
+         Entering BIOS setup temporary disables watchdog operation regardless to current state,
+         so system will not be restarted while user in BIOS setup.
+
+         Once watchdog was enabled the system will be restarted every
+         "Watchdog Timer Value" period, so to prevent it user can restart or
+         disable the watchdog.
+
+         To compile this driver as a module, choose M here: the
+         module will be called sbc_fitpc2_wdt.
+
+         Most people will say N.
+
 config EUROTECH_WDT
        tristate "Eurotech CPU-1220/1410 Watchdog Timer"
        depends on X86
@@ -703,6 +774,12 @@ config SBC_EPX_C3_WATCHDOG
 
 # MIPS Architecture
 
+config BCM47XX_WDT
+       tristate "Broadcom BCM47xx Watchdog Timer"
+       depends on BCM47XX
+       help
+         Hardware driver for the Broadcom BCM47xx Watchog Timer.
+
 config RC32434_WDT
        tristate "IDT RC32434 SoC Watchdog Timer"
        depends on MIKROTIK_RB532
@@ -975,24 +1052,16 @@ config WDTPCI
        ---help---
          If you have a PCI-WDT500/501 watchdog board, say Y here, otherwise N.
 
-         To compile this driver as a module, choose M here: the
-         module will be called wdt_pci.
-
-config WDT_501_PCI
-       bool "PCI-WDT501 features"
-       depends on WDTPCI
-       help
-         Saying Y here and creating a character special file /dev/temperature
-         with major number 10 and minor number 131 ("man mknod") will give
-         you a thermometer inside your computer: reading from
-         /dev/temperature yields one byte, the temperature in degrees
-         Fahrenheit. This works only if you have a PCI-WDT501 watchdog board
-         installed.
+         If you have a PCI-WDT501 watchdog board then you can enable the
+         temperature sensor by setting the type parameter to 501.
 
          If you want to enable the Fan Tachometer on the PCI-WDT501, then you
          can do this via the tachometer parameter. Only do this if you have a
          fan tachometer actually set up.
 
+         To compile this driver as a module, choose M here: the
+         module will be called wdt_pci.
+
 #
 # USB-based Watchdog Cards
 #