From 8188f6fb3d51d067f90e1c09325529982bb04058 Mon Sep 17 00:00:00 2001 From: John Stultz Date: Thu, 9 Feb 2012 14:24:36 -0800 Subject: [PATCH] --- yaml --- r: 289069 b: refs/heads/master c: fe8d2727ffa65bcb516b4947bec1c546841e7d25 h: refs/heads/master i: 289067: f9ea09bb0d3c574b842e19da98bfd980dd716d23 v: v3 --- [refs] | 2 +- trunk/drivers/staging/android/Kconfig | 17 +++++++++++++++++ trunk/drivers/staging/android/Makefile | 2 ++ 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 41c96ba46d45..d75608565dd3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 79ef07162fb088f8afe7709881e2b5e2a4098202 +refs/heads/master: fe8d2727ffa65bcb516b4947bec1c546841e7d25 diff --git a/trunk/drivers/staging/android/Kconfig b/trunk/drivers/staging/android/Kconfig index becf711117ef..2a2b3867a656 100644 --- a/trunk/drivers/staging/android/Kconfig +++ b/trunk/drivers/staging/android/Kconfig @@ -105,6 +105,23 @@ config ANDROID_PMEM source "drivers/staging/android/switch/Kconfig" +config ANDROID_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 ANDROID_INTF_ALARM_DEV + bool "Android alarm device" + depends on ANDROID_INTF_ALARM + default y + help + Exports the alarm interface to user-space. + endif # if ANDROID endmenu diff --git a/trunk/drivers/staging/android/Makefile b/trunk/drivers/staging/android/Makefile index eaed1ff64f0f..7c6e53b89e6e 100644 --- a/trunk/drivers/staging/android/Makefile +++ b/trunk/drivers/staging/android/Makefile @@ -7,3 +7,5 @@ obj-$(CONFIG_ANDROID_TIMED_GPIO) += timed_gpio.o obj-$(CONFIG_ANDROID_LOW_MEMORY_KILLER) += lowmemorykiller.o obj-$(CONFIG_ANDROID_PMEM) += pmem.o obj-$(CONFIG_ANDROID_SWITCH) += switch/ +obj-$(CONFIG_ANDROID_INTF_ALARM) += alarm.o +obj-$(CONFIG_ANDROID_INTF_ALARM_DEV) += alarm-dev.o