Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fe8d2727 authored by John Stultz's avatar John Stultz Committed by Greg Kroah-Hartman
Browse files

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: default avatarJohn Stultz <john.stultz@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 79ef0716

drivers/staging/android/Kconfig

+17 −0
Original line number Diff line number Diff line
@@ -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

drivers/staging/android/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -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