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 master.kernel.org:/pub/scm/linux/kernel/git/tmlind/linux-omap-upstream into...
[pandora-kernel.git]
/
arch
/
sh
/
kernel
/
Makefile
diff --git
a/arch/sh/kernel/Makefile
b/arch/sh/kernel/Makefile
index
7a86eeb
..
f05cd96
100644
(file)
--- a/
arch/sh/kernel/Makefile
+++ b/
arch/sh/kernel/Makefile
@@
-8,7
+8,7
@@
obj-y := process.o signal.o entry.o traps.o irq.o \
ptrace.o setup.o time.o sys_sh.o semaphore.o \
io.o io_generic.o sh_ksyms.o
-obj-y += cpu/
+obj-y += cpu/
timers/
obj-$(CONFIG_SMP) += smp.o
obj-$(CONFIG_CF_ENABLER) += cf-enabler.o