Merge commit 'v3.0-rc6' into android-3.0

[firefly-linux-kernel-4.4.55.git] / drivers / rtc / Kconfig

diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index ce2aabf5c550a2706bc39dd17ac2b1c5a94142e8..27c37743e2c9c33b3a046648a553b83ce56aad08 100644 (file)
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -106,6 +106,24 @@ config RTC_INTF_DEV_UIE_EMUL
          clock several times per second, please enable this option
          only if you know that you really need it.
 
+config RTC_INTF_ALARM
+       bool "Android alarm driver"
+       depends on RTC_CLASS
+       default y
+       help
+         Provides non-wakeup and rtc backed wakeup alarms based on rtc or
+         elapsed realtime, and a non-wakeup alarm on the monotonic clock.
+         Also provides an interface to set the wall time which must be used
+         for elapsed realtime to work.
+
+config RTC_INTF_ALARM_DEV
+       bool "Android alarm device"
+       depends on RTC_INTF_ALARM
+       default y
+       help
+         Exports the alarm interface to user-space.
+
+
 config RTC_DRV_TEST
        tristate "Test driver/device"
        help