Merge tag 'trace-seq-buf-3.19-v2' of git://git.kernel.org/pub/scm/linux/kernel/git...

[cascardo/linux.git] / drivers / rtc / Kconfig

diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index b682651..f15cddf 100644 (file)
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -192,6 +192,14 @@ config RTC_DRV_DS1374
          This driver can also be built as a module. If so, the module
          will be called rtc-ds1374.
 
+config RTC_DRV_DS1374_WDT
+       bool "Dallas/Maxim DS1374 watchdog timer"
+       depends on RTC_DRV_DS1374
+       help
+         If you say Y here you will get support for the
+         watchdog timer in the Dallas Semiconductor DS1374
+         real-time clock chips.
+
 config RTC_DRV_DS1672
        tristate "Dallas/Maxim DS1672"
        help
@@ -979,6 +987,17 @@ config RTC_DRV_NUC900
          If you say yes here you get support for the RTC subsystem of the
          NUC910/NUC920 used in embedded systems.
 
+config RTC_DRV_OPAL
+       tristate "IBM OPAL RTC driver"
+       depends on PPC_POWERNV
+       default y
+       help
+         If you say yes here you get support for the PowerNV platform RTC
+         driver based on OPAL interfaces.
+
+         This driver can also be built as a module. If so, the module
+         will be called rtc-opal.
+
 comment "on-CPU RTC drivers"
 
 config RTC_DRV_DAVINCI