Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatchin...

[linux.git] / drivers / rtc / Kconfig

diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index 63bd72a96210a6ead351f5dfd62e4bb51bd71c80..1adf9f8156522dc2269a23f5ba1838bf4bed2df7 100644 (file)
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -886,9 +886,15 @@ config RTC_DRV_DS3232_HWMON
 config RTC_DRV_PCF2127
        tristate "NXP PCF2127"
        depends on RTC_I2C_AND_SPI
+       select WATCHDOG_CORE if WATCHDOG
        help
          If you say yes here you get support for the NXP PCF2127/29 RTC
-         chips.
+         chips with integrated quartz crystal for industrial applications.
+         Both chips also have watchdog timer and tamper switch detection
+         features.
+
+         PCF2127 has an additional feature of 512 bytes battery backed
+         memory that's accessible using nvmem interface.
 
          This driver can also be built as a module. If so, the module
          will be called rtc-pcf2127.
@@ -1279,7 +1285,7 @@ config RTC_DRV_ZYNQMP
 
 config RTC_DRV_CROS_EC
        tristate "Chrome OS EC RTC driver"
-       depends on MFD_CROS_EC
+       depends on CROS_EC
        help
          If you say yes here you will get support for the
          Chrome OS Embedded Controller's RTC.