diff options
| author | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:41:00 -0800 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:41:00 -0800 |
| commit | a70c0eab1897b2bb15d89f43267828682950842e (patch) | |
| tree | 3b53319c93e0a73db1d8df5947e6ed621ccbb5df /drivers/rtc/Kconfig | |
| parent | 83adb17804d48ead8fc91a8ab7dda81db13b9444 (diff) | |
| parent | 7f9ed524778bcdcd8a51bdeab2095655fb57c431 (diff) | |
Merge branch 'korg-android-3.1' into korg-android+linux-tegra-3.1
Conflicts:
arch/arm/mm/cache-l2x0.c
drivers/misc/Kconfig
drivers/misc/Makefile
Signed-off-by: Dan Willemsen <dwillemsen@nvidia.com>
Diffstat (limited to 'drivers/rtc/Kconfig')
| -rw-r--r-- | drivers/rtc/Kconfig | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig index fe4cc66a8bcb..ef5546cd6802 100644 --- 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 |