summaryrefslogtreecommitdiffstats
path: root/drivers/rtc
diff options
context:
space:
mode:
authorAlexandre Belloni <alexandre.belloni@bootlin.com>2020-07-20 09:52:49 +0200
committerAlexandre Belloni <alexandre.belloni@bootlin.com>2020-07-21 09:56:34 +0200
commitc7f3be4c94d3686ec67b7e7b4fb47e4c225a2789 (patch)
treea875f09162bf780c0f9042235931849d55274b51 /drivers/rtc
parenta5e6f964bb2c613933de58a35ddfa306128ba004 (diff)
downloadlinux-stable-c7f3be4c94d3686ec67b7e7b4fb47e4c225a2789.tar.gz
linux-stable-c7f3be4c94d3686ec67b7e7b4fb47e4c225a2789.tar.bz2
linux-stable-c7f3be4c94d3686ec67b7e7b4fb47e4c225a2789.zip
rtc: ds1374: fix RTC_DRV_DS1374_WDT dependencies
It is not enough to select WATCHDOG_CORE, the watchdog part of the driver now also depends on WATCHDOG. This is currently the best we can do because alarm support and watchdog support are mutually exclusive. Reported-by: Randy Dunlap <rdunlap@infradead.org> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Acked-by: Randy Dunlap <rdunlap@infradead.org> # build-tested Link: https://lore.kernel.org/r/20200720075250.1019172-1-alexandre.belloni@bootlin.com
Diffstat (limited to 'drivers/rtc')
-rw-r--r--drivers/rtc/Kconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index c25d51f35f0c..2753e0f54cc3 100644
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -281,8 +281,8 @@ config RTC_DRV_DS1374
config RTC_DRV_DS1374_WDT
bool "Dallas/Maxim DS1374 watchdog timer"
- depends on RTC_DRV_DS1374
- select WATCHDOG_CORE if WATCHDOG
+ depends on RTC_DRV_DS1374 && WATCHDOG
+ select WATCHDOG_CORE
help
If you say Y here you will get support for the
watchdog timer in the Dallas Semiconductor DS1374