Merge https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf

[mirror_ubuntu-hirsute-kernel.git] / drivers / watchdog / Kconfig

diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index f22e37337030d31b1f34b3171a2c9611ea03eb86..7ff941e71b795259e7cdd3db4ae6399e001cf9f7 100644 (file)
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -386,6 +386,7 @@ config ARM_SBSA_WATCHDOG
 config ARMADA_37XX_WATCHDOG
        tristate "Armada 37xx watchdog"
        depends on ARCH_MVEBU || COMPILE_TEST
+       depends on HAS_IOMEM
        select MFD_SYSCON
        select WATCHDOG_CORE
        help
@@ -631,7 +632,7 @@ config SUNXI_WATCHDOG
 
 config COH901327_WATCHDOG
        bool "ST-Ericsson COH 901 327 watchdog"
-       depends on ARCH_U300 || (ARM && COMPILE_TEST)
+       depends on ARCH_U300 || (ARM && COMMON_CLK && COMPILE_TEST)
        default y if MACH_U300
        select WATCHDOG_CORE
        help
@@ -789,6 +790,7 @@ config MOXART_WDT
 
 config SIRFSOC_WATCHDOG
        tristate "SiRFSOC watchdog"
+       depends on HAS_IOMEM
        depends on ARCH_SIRF || COMPILE_TEST
        select WATCHDOG_CORE
        default y
@@ -1696,16 +1698,6 @@ config WDT_MTX1
          Hardware driver for the MTX-1 boards. This is a watchdog timer that
          will reboot the machine after a 100 seconds timer expired.
 
-config PNX833X_WDT
-       tristate "PNX833x Hardware Watchdog"
-       depends on SOC_PNX8335
-       depends on BROKEN
-       help
-         Hardware driver for the PNX833x's watchdog. This is a
-         watchdog timer that will reboot the machine after a programmable
-         timer has expired and no process has written to /dev/watchdog during
-         that time.
-
 config SIBYTE_WDOG
        tristate "Sibyte SoC hardware watchdog"
        depends on CPU_SB1 || (MIPS && COMPILE_TEST)