Merge tag 'linux-watchdog-6.1-rc1' of git://www.linux-watchdog.org/linux-watchdog

[thirdparty/linux.git] / drivers / watchdog / Kconfig

diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index bd3bb4abca51cff960f4e26e08f556a0cc41366e..b64bc49c7f30edda4e422519971430ffe2d7a0c7 100644 (file)
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -1810,7 +1810,7 @@ config BCM7038_WDT
        tristate "BCM63xx/BCM7038 Watchdog"
        select WATCHDOG_CORE
        depends on HAS_IOMEM
-       depends on ARCH_BCM4908 || ARCH_BRCMSTB || BMIPS_GENERIC || BCM63XX || COMPILE_TEST
+       depends on ARCH_BCMBCA || ARCH_BRCMSTB || BMIPS_GENERIC || BCM63XX || COMPILE_TEST
        help
          Watchdog driver for the built-in hardware in Broadcom 7038 and
          later SoCs used in set-top boxes.  BCM7038 was made public
@@ -1946,10 +1946,10 @@ config BOOKE_WDT
 config BOOKE_WDT_DEFAULT_TIMEOUT
        int "PowerPC Book-E Watchdog Timer Default Timeout"
        depends on BOOKE_WDT
-       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
+       default 38 if PPC_E500
+       range 0 63 if PPC_E500
+       default 3 if !PPC_E500
+       range 0 3 if !PPC_E500
        help
          Select the default watchdog timer period to be used by the PowerPC
          Book-E watchdog driver.  A watchdog "event" occurs when the bit