Merge tag 'renesas-boards-cleanups2-for-v3.19' of git://git.kernel.org/pub/scm/linux...

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

diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index a51ccf3461fb8ab7ae8b0c714f5b262cb1b08647..d0107d424ee47feeb7cd16ff6b430462215b0db2 100644 (file)
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -132,6 +132,7 @@ config WM8350_WATCHDOG
 
 config XILINX_WATCHDOG
        tristate "Xilinx Watchdog timer"
+       depends on HAS_IOMEM
        select WATCHDOG_CORE
        help
          Watchdog driver for the xps_timebase_wdt ip core.
@@ -472,7 +473,7 @@ config SIRFSOC_WATCHDOG
 
 config TEGRA_WATCHDOG
        tristate "Tegra watchdog"
-       depends on ARCH_TEGRA || COMPILE_TEST
+       depends on (ARCH_TEGRA || COMPILE_TEST) && HAS_IOMEM
        select WATCHDOG_CORE
        help
          Say Y here to include support for the watchdog timer
@@ -494,6 +495,16 @@ config QCOM_WDT
          To compile this driver as a module, choose M here: the
          module will be called qcom_wdt.
 
+config MESON_WATCHDOG
+       tristate "Amlogic Meson SoCs watchdog support"
+       depends on ARCH_MESON
+       select WATCHDOG_CORE
+       help
+         Say Y here to include support for the watchdog timer
+         in Amlogic Meson SoCs.
+         To compile this driver as a module, choose M here: the
+         module will be called meson_wdt.
+
 # AVR32 Architecture
 
 config AT32AP700X_WDT