projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb
[powerpc.git]
/
arch
/
sh
/
kernel
/
Makefile
diff --git
a/arch/sh/kernel/Makefile
b/arch/sh/kernel/Makefile
index
2f6d2bc
..
ff30d7f
100644
(file)
--- a/
arch/sh/kernel/Makefile
+++ b/
arch/sh/kernel/Makefile
@@
-6,7
+6,8
@@
extra-y := head.o init_task.o vmlinux.lds
obj-y := process.o signal.o traps.o irq.o \
ptrace.o setup.o time.o sys_sh.o semaphore.o \
- io.o io_generic.o sh_ksyms.o syscalls.o
+ io.o io_generic.o sh_ksyms.o syscalls.o \
+ debugtraps.o
obj-y += cpu/ timers/
obj-$(CONFIG_VSYSCALL) += vsyscall/