diff options
| author | John Stultz | 2012-02-09 23:24:36 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2012-02-10 19:06:43 +0100 |
| commit | fe8d2727ffa65bcb516b4947bec1c546841e7d25 (patch) | |
| tree | b3c15f50b0d46972a31b607dde4e2acf115923c4 /drivers/staging/android | |
| parent | staging: android-alarm: HACK: wakelock workaround (diff) | |
| download | kernel-qcow2-linux-fe8d2727ffa65bcb516b4947bec1c546841e7d25.tar.gz kernel-qcow2-linux-fe8d2727ffa65bcb516b4947bec1c546841e7d25.tar.xz kernel-qcow2-linux-fe8d2727ffa65bcb516b4947bec1c546841e7d25.zip | |
staging: android-alarm: Reenable android alarm driver
Now that it builds, re-enable android alarm driver in
the makefile and kconfig
CC: Arve Hjønnevåg <arve@android.com>
CC: Android Kernel Team <kernel-team@android.com>
Signed-off-by: John Stultz <john.stultz@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/android')
| -rw-r--r-- | drivers/staging/android/Kconfig | 17 | ||||
| -rw-r--r-- | drivers/staging/android/Makefile | 2 |
2 files changed, 19 insertions, 0 deletions
diff --git a/drivers/staging/android/Kconfig b/drivers/staging/android/Kconfig index becf711117ef..2a2b3867a656 100644 --- a/drivers/staging/android/Kconfig +++ b/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/drivers/staging/android/Makefile b/drivers/staging/android/Makefile index eaed1ff64f0f..7c6e53b89e6e 100644 --- a/drivers/staging/android/Makefile +++ b/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 |