Merge git://www.linux-watchdog.org/linux-watchdog

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

diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index ce4f3a7f95fd36fb7624a7c928ace24dac61e60c..e5e7c5505de7dc8f289f3891013b0eac25399747 100644 (file)
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -169,7 +169,6 @@ config AT91SAM9X_WATCHDOG
 
 config CADENCE_WATCHDOG
        tristate "Cadence Watchdog Timer"
-       depends on ARM
        select WATCHDOG_CORE
        help
          Say Y here if you want to include support for the watchdog
@@ -1190,6 +1189,7 @@ config OCTEON_WDT
        tristate "Cavium OCTEON SOC family Watchdog Timer"
        depends on CAVIUM_OCTEON_SOC
        default y
+       select WATCHDOG_CORE
        select EXPORT_UASM if OCTEON_WDT = m
        help
          Hardware driver for OCTEON's on chip watchdog timer.