git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
[sfrench/cifs-2.6.git]
/
arch
/
mn10300
/
kernel
/
Makefile
diff --git
a/arch/mn10300/kernel/Makefile
b/arch/mn10300/kernel/Makefile
index ef07c956170a8f658b075c5cb86233dcbaabc4b3..23f2ab67574c171b72bcecfc1199572c1604ebcd 100644
(file)
--- a/
arch/mn10300/kernel/Makefile
+++ b/
arch/mn10300/kernel/Makefile
@@
-3,7
+3,7
@@
#
extra-y := head.o init_task.o vmlinux.lds
#
extra-y := head.o init_task.o vmlinux.lds
-obj-y := process.o s
emaphore.o s
ignal.o entry.o fpu.o traps.o irq.o \
+obj-y := process.o signal.o entry.o fpu.o traps.o irq.o \
ptrace.o setup.o time.o sys_mn10300.o io.o kthread.o \
switch_to.o mn10300_ksyms.o kernel_execve.o
ptrace.o setup.o time.o sys_mn10300.o io.o kthread.o \
switch_to.o mn10300_ksyms.o kernel_execve.o