Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jesse/openvswitch

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

diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 26e1fdbddf690c88cd20dbf015955d6b13295a0a..9fcc70c11ceae14b78052dbab2b4eaafdee553db 100644 (file)
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -79,6 +79,7 @@ config DA9052_WATCHDOG
 config DA9055_WATCHDOG
        tristate "Dialog Semiconductor DA9055 Watchdog"
        depends on MFD_DA9055
 config DA9055_WATCHDOG
        tristate "Dialog Semiconductor DA9055 Watchdog"
        depends on MFD_DA9055

+       select WATCHDOG_CORE

        help
          If you say yes here you get support for watchdog on the Dialog
          Semiconductor DA9055 PMIC.
        help
          If you say yes here you get support for watchdog on the Dialog
          Semiconductor DA9055 PMIC.


@@ -108,7 +109,7 @@ config WM8350_WATCHDOG
 
 config ARM_SP805_WATCHDOG
        tristate "ARM SP805 Watchdog"
 
 config ARM_SP805_WATCHDOG
        tristate "ARM SP805 Watchdog"

-       depends on ARM_AMBA
+       depends on ARM && ARM_AMBA

        select WATCHDOG_CORE
        help
          ARM Primecell SP805 Watchdog timer. This will reboot your system when
        select WATCHDOG_CORE
        help
          ARM Primecell SP805 Watchdog timer. This will reboot your system when


@@ -116,7 +117,7 @@ config ARM_SP805_WATCHDOG
 
 config AT91RM9200_WATCHDOG
        tristate "AT91RM9200 watchdog"
 
 config AT91RM9200_WATCHDOG
        tristate "AT91RM9200 watchdog"

-       depends on ARCH_AT91RM9200
+       depends on ARCH_AT91

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


@@ -124,6 +125,7 @@ config AT91RM9200_WATCHDOG
 config AT91SAM9X_WATCHDOG
        tristate "AT91SAM9X / AT91CAP9 watchdog"
        depends on ARCH_AT91 && !ARCH_AT91RM9200
 config AT91SAM9X_WATCHDOG
        tristate "AT91SAM9X / AT91CAP9 watchdog"
        depends on ARCH_AT91 && !ARCH_AT91RM9200

+       select WATCHDOG_CORE

        help
          Watchdog timer embedded into AT91SAM9X and AT91CAP9 chips. This will
          reboot your system when the timeout is reached.
        help
          Watchdog timer embedded into AT91SAM9X and AT91CAP9 chips. This will
          reboot your system when the timeout is reached.


@@ -316,14 +318,15 @@ config TWL4030_WATCHDOG
          Support for TI TWL4030 watchdog.  Say 'Y' here to enable the
          watchdog timer support for TWL4030 chips.
 
          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
+config STMP3XXX_RTC_WATCHDOG
+       tristate "Freescale STMP3XXX & i.MX23/28 watchdog"
+       depends on RTC_DRV_STMP
+       select WATCHDOG_CORE

        help
        help

-         Say Y here if to include support for the watchdog timer
-         for the Sigmatel STMP37XX/378X SoC.
+         Say Y here to include support for the watchdog timer inside
+         the RTC for the STMP37XX/378X or i.MX23/28 SoC.

          To compile this driver as a module, choose M here: the
          To compile this driver as a module, choose M here: the

-         module will be called stmp3xxx_wdt.
+         module will be called stmp3xxx_rtc_wdt.

 
 config NUC900_WATCHDOG
        tristate "Nuvoton NUC900 watchdog"
 
 config NUC900_WATCHDOG
        tristate "Nuvoton NUC900 watchdog"


@@ -376,6 +379,18 @@ config UX500_WATCHDOG
          To compile this driver as a module, choose M here: the
          module will be called ux500_wdt.
 
          To compile this driver as a module, choose M here: the
          module will be called ux500_wdt.
 

+config RETU_WATCHDOG
+       tristate "Retu watchdog"
+       depends on MFD_RETU
+       select WATCHDOG_CORE
+       help
+         Retu watchdog driver for Nokia Internet Tablets (770, N800,
+         N810). At least on N800 the watchdog cannot be disabled, so
+         this driver is essential and you should enable it.
+
+         To compile this driver as a module, choose M here: the
+         module will be called retu_wdt.
+

 # AVR32 Architecture
 
 config AT32AP700X_WDT
 # AVR32 Architecture
 
 config AT32AP700X_WDT


@@ -593,7 +608,7 @@ config IE6XX_WDT
 
 config INTEL_SCU_WATCHDOG
        bool "Intel SCU Watchdog for Mobile Platforms"
 
 config INTEL_SCU_WATCHDOG
        bool "Intel SCU Watchdog for Mobile Platforms"

-       depends on X86_MRST
+       depends on X86_INTEL_MID

        ---help---
          Hardware driver for the watchdog time built into the Intel SCU
          for Intel Mobile Platforms.
        ---help---
          Hardware driver for the watchdog time built into the Intel SCU
          for Intel Mobile Platforms.


@@ -983,6 +998,7 @@ config ATH79_WDT
 config BCM47XX_WDT
        tristate "Broadcom BCM47xx Watchdog Timer"
        depends on BCM47XX
 config BCM47XX_WDT
        tristate "Broadcom BCM47xx Watchdog Timer"
        depends on BCM47XX

+       select WATCHDOG_CORE

        help
          Hardware driver for the Broadcom BCM47xx Watchdog Timer.
 
        help
          Hardware driver for the Broadcom BCM47xx Watchdog Timer.
 


@@ -1131,6 +1147,7 @@ config PIKA_WDT
 config BOOKE_WDT
        tristate "PowerPC Book-E Watchdog Timer"
        depends on BOOKE || 4xx
 config BOOKE_WDT
        tristate "PowerPC Book-E Watchdog Timer"
        depends on BOOKE || 4xx

+       select WATCHDOG_CORE

        ---help---
          Watchdog driver for PowerPC Book-E chips, such as the Freescale
          MPC85xx SOCs and the IBM PowerPC 440.
        ---help---
          Watchdog driver for PowerPC Book-E chips, such as the Freescale
          MPC85xx SOCs and the IBM PowerPC 440.