projects
/
linux-2.6
/ 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/x86/linux...
[linux-2.6]
/
arch
/
m68k
/
kernel
/
Makefile
diff --git
a/arch/m68k/kernel/Makefile
b/arch/m68k/kernel/Makefile
index
a806208
..
7a62a71
100644
(file)
--- a/
arch/m68k/kernel/Makefile
+++ b/
arch/m68k/kernel/Makefile
@@
-10,7
+10,7
@@
endif
extra-y += vmlinux.lds
obj-y := entry.o process.o traps.o ints.o signal.o ptrace.o module.o \
- sys_m68k.o time.o se
maphore.o se
tup.o m68k_ksyms.o devres.o
+ sys_m68k.o time.o setup.o m68k_ksyms.o devres.o
devres-y = ../../../kernel/irq/devres.o