summaryrefslogtreecommitdiffstats
path: root/arch/sh/kernel/Makefile
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2010-03-08 21:45:19 +0900
committerPaul Mundt <lethal@linux-sh.org>2010-03-09 11:57:17 +0900
commit51a5006afcd13176276f0935ee57c4cc6f210e83 (patch)
treea5842fabed2ac33ac5b807d5764687babf5787d3 /arch/sh/kernel/Makefile
parent40d1f0048289b1baed859baee06878417fae540e (diff)
downloadlinux-51a5006afcd13176276f0935ee57c4cc6f210e83.tar.gz
linux-51a5006afcd13176276f0935ee57c4cc6f210e83.tar.bz2
linux-51a5006afcd13176276f0935ee57c4cc6f210e83.zip
sh: Merge clkdev API updates.
This rolls in the remainder of the clkdev API bits from the ARM tree. This can more or less be used verbatim, so we just copy it over and nuke our local version. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/kernel/Makefile')
-rw-r--r--arch/sh/kernel/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/kernel/Makefile b/arch/sh/kernel/Makefile
index 02fd3ae8b0ee..650b92f00ee5 100644
--- a/arch/sh/kernel/Makefile
+++ b/arch/sh/kernel/Makefile
@@ -11,7 +11,7 @@ endif
CFLAGS_REMOVE_return_address.o = -pg
-obj-y := debugtraps.o dma-nommu.o dumpstack.o \
+obj-y := clkdev.o debugtraps.o dma-nommu.o dumpstack.o \
idle.o io.o io_generic.o irq.o \
irq_$(BITS).o machvec.o nmi_debug.o process.o \
process_$(BITS).o ptrace_$(BITS).o \