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 879232186ca6cceb087d7b9d3666dac4d0ecfcb8..9fcc70c11ceae14b78052dbab2b4eaafdee553db 100644 (file)
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -109,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


@@ -117,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.


@@ -125,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.


@@ -317,15 +318,6 @@ 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
-       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 STMP3XXX_RTC_WATCHDOG
        tristate "Freescale STMP3XXX & i.MX23/28 watchdog"
        depends on RTC_DRV_STMP
 config STMP3XXX_RTC_WATCHDOG
        tristate "Freescale STMP3XXX & i.MX23/28 watchdog"
        depends on RTC_DRV_STMP


@@ -1006,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.
 


@@ -1154,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.