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>

diff --git a/drivers/staging/android/Kconfig b/drivers/staging/android/Kconfig
index becf711117efffb56afda428d38ed4dc5428c9df..2a2b3867a65650045e909c9db495892d2784b234 100644 (file)
--- 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 eaed1ff64f0f74a286480c00d9535b8ccdc39846..7c6e53b89e6e692a56baee1d9528743b0a19c4fc 100644 (file)
--- 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