Merge branch 'x86/cpufeature' into irq/numa

[sfrench/cifs-2.6.git] / arch / cris / kernel / Makefile

diff --git a/arch/cris/kernel/Makefile b/arch/cris/kernel/Makefile
index c8e8ea5709897977dcdc4059e435d4cbd8200f49..ee7bcd4d20b270d0427b62f40c0895a9aa3eec77 100644 (file)
--- a/arch/cris/kernel/Makefile
+++ b/arch/cris/kernel/Makefile
@@ -5,8 +5,7 @@
 
 extra-y        := vmlinux.lds
 
-obj-y   := process.o traps.o irq.o ptrace.o setup.o \
-          time.o sys_cris.o semaphore.o
+obj-y   := process.o traps.o irq.o ptrace.o setup.o time.o sys_cris.o
 
 obj-$(CONFIG_MODULES)    += crisksyms.o
 obj-$(CONFIG_MODULES)   += module.o