From: Huang, Tao <huangtao@rock-chips.com>
Date: Tue, 5 May 2015 02:53:44 +0000 (+0800)
Subject: Revert "staging: Remove logger and alarm-dev from android Makefile"
X-Git-Tag: firefly_0821_release~4158^2~124
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=1c6fac5d715606ea21591250daee2a45fc74e432;p=firefly-linux-kernel-4.4.55.git

Revert "staging: Remove logger and alarm-dev from android Makefile"

This reverts commit a290c3e430b1e5c7ddacc3e126e93a008c682cd4.
---

diff --git a/drivers/staging/android/Makefile b/drivers/staging/android/Makefile
index 30ba2f0cb084..c223ef72bb38 100644
--- a/drivers/staging/android/Makefile
+++ b/drivers/staging/android/Makefile
@@ -4,8 +4,10 @@ obj-y					+= ion/
 obj-$(CONFIG_FIQ_DEBUGGER)		+= fiq_debugger/
 
 obj-$(CONFIG_ASHMEM)			+= ashmem.o
+obj-$(CONFIG_ANDROID_LOGGER)		+= logger.o
 obj-$(CONFIG_ANDROID_TIMED_OUTPUT)	+= timed_output.o
 obj-$(CONFIG_ANDROID_TIMED_GPIO)	+= timed_gpio.o
 obj-$(CONFIG_ANDROID_LOW_MEMORY_KILLER)	+= lowmemorykiller.o
+obj-$(CONFIG_ANDROID_INTF_ALARM_DEV)	+= alarm-dev.o
 obj-$(CONFIG_SYNC)			+= sync.o
 obj-$(CONFIG_SW_SYNC)			+= sw_sync.o