git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'topic/asoc' into for-linus
[pandora-kernel.git]
/
arch
/
cris
/
arch-v32
/
kernel
/
Makefile
diff --git
a/arch/cris/arch-v32/kernel/Makefile
b/arch/cris/arch-v32/kernel/Makefile
index
993d987
..
4035835
100644
(file)
--- a/
arch/cris/arch-v32/kernel/Makefile
+++ b/
arch/cris/arch-v32/kernel/Makefile
@@
-9,8
+9,6
@@
obj-y := entry.o traps.o irq.o debugport.o \
process.o ptrace.o setup.o signal.o traps.o time.o \
cache.o cacheflush.o
-obj-$(CONFIG_ETRAXFS_SIM) += vcs_hook.o
-
obj-$(CONFIG_SMP) += smp.o
obj-$(CONFIG_ETRAX_KGDB) += kgdb.o kgdb_asm.o
obj-$(CONFIG_ETRAX_FAST_TIMER) += fasttimer.o