projects
/
firefly-linux-kernel-4.4.55.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f07d7eb
)
Revert "staging: Remove logger and alarm-dev from android Makefile"
author
Huang, Tao
<huangtao@rock-chips.com>
Tue, 5 May 2015 02:53:44 +0000
(10:53 +0800)
committer
Huang, Tao
<huangtao@rock-chips.com>
Tue, 5 May 2015 02:53:44 +0000
(10:53 +0800)
This reverts commit
a290c3e430b1e5c7ddacc3e126e93a008c682cd4
.
drivers/staging/android/Makefile
patch
|
blob
|
history
diff --git
a/drivers/staging/android/Makefile
b/drivers/staging/android/Makefile
index 30ba2f0cb084e956963700d4d2bec00e123a9d62..c223ef72bb389e8df4303a731dc35e18af99c874 100644
(file)
--- 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