OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c60e107
)
Revert "staging: Remove logger and alarm-dev from android Makefile"
author
Chih-Wei Huang
<cwhuang@linux.org.tw>
Wed, 29 Apr 2015 15:44:42 +0000
(23:44 +0800)
committer
Chih-Wei Huang
<cwhuang@linux.org.tw>
Wed, 29 Apr 2015 15:44:42 +0000
(23:44 +0800)
This reverts commit
71e365ed0ca893cae8d72cbd4b476a9589003098
.
drivers/staging/android/Makefile
patch
|
blob
|
history
diff --git
a/drivers/staging/android/Makefile
b/drivers/staging/android/Makefile
index
3ebaa30
..
ae73b5d
100644
(file)
--- a/
drivers/staging/android/Makefile
+++ b/
drivers/staging/android/Makefile
@@
-3,9
+3,11
@@
ccflags-y += -I$(src) # needed for trace events
obj-y += ion/
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 sync_debug.o
obj-$(CONFIG_SW_SYNC) += sw_sync.o
obj-$(CONFIG_EFI_BOOTLOADER_CONTROL) += efibc.o