projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'rk_develop-3.10' into rk_develop-3.10-next
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
kernel
/
Makefile
diff --git
a/arch/arm/kernel/Makefile
b/arch/arm/kernel/Makefile
index 33373564018b6a05e9437418a5966d524b1a36c5..f2aea1155f84fe35f3cbe8de42a38ebc3e140d77 100644
(file)
--- a/
arch/arm/kernel/Makefile
+++ b/
arch/arm/kernel/Makefile
@@
-24,7
+24,6
@@
obj-$(CONFIG_ATAGS) += atags_parse.o
obj-$(CONFIG_ATAGS_PROC) += atags_proc.o
obj-$(CONFIG_DEPRECATED_PARAM_STRUCT) += atags_compat.o
-obj-$(CONFIG_OC_ETM) += etm.o
obj-$(CONFIG_CPU_IDLE) += cpuidle.o
obj-$(CONFIG_ISA_DMA_API) += dma.o
obj-$(CONFIG_FIQ) += fiq.o fiqasm.o