Merge branch 'audit' of git://git.linaro.org/people/rmk/linux-arm

[firefly-linux-kernel-4.4.55.git] / drivers / watchdog / Kconfig

diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index fe819b76de5685f2cf28a2db9000a117ca8338ce..53d75719078e8b9dbbb0562a59747bb1fb06d968 100644 (file)
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -279,6 +279,7 @@ config DAVINCI_WATCHDOG
 config ORION_WATCHDOG
        tristate "Orion watchdog"
        depends on ARCH_ORION5X || ARCH_KIRKWOOD
+       select WATCHDOG_CORE
        help
          Say Y here if to include support for the watchdog timer
          in the Marvell Orion5x and Kirkwood ARM SoCs.
@@ -578,6 +579,7 @@ config INTEL_SCU_WATCHDOG
 config ITCO_WDT
        tristate "Intel TCO Timer/Watchdog"
        depends on (X86 || IA64) && PCI
+       select WATCHDOG_CORE
        select LPC_ICH
        ---help---
          Hardware driver for the intel TCO timer based watchdog devices.
@@ -1115,10 +1117,10 @@ config BOOKE_WDT
 config BOOKE_WDT_DEFAULT_TIMEOUT
        int "PowerPC Book-E Watchdog Timer Default Timeout"
        depends on BOOKE_WDT
-       default 38 if FSL_BOOKE
-       range 0 63 if FSL_BOOKE
-       default 3 if !FSL_BOOKE
-       range 0 3 if !FSL_BOOKE
+       default 38 if PPC_FSL_BOOK3E
+       range 0 63 if PPC_FSL_BOOK3E
+       default 3 if !PPC_FSL_BOOK3E
+       range 0 3 if !PPC_FSL_BOOK3E
        help
          Select the default watchdog timer period to be used by the PowerPC
          Book-E watchdog driver.  A watchdog "event" occurs when the bit