projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'iwlwifi-next-for-kalle-2014-12-30' of https://git.kernel.org/pub/scm/linux...
[cascardo/linux.git]
/
arch
/
arm
/
kernel
/
Makefile
diff --git
a/arch/arm/kernel/Makefile
b/arch/arm/kernel/Makefile
index
f290ac8
..
fb2b71e
100644
(file)
--- a/
arch/arm/kernel/Makefile
+++ b/
arch/arm/kernel/Makefile
@@
-30,7
+30,6
@@
else
obj-y += entry-armv.o
endif
-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