---

yaml --- r: 146708 b: refs/heads/master c: 25483ef h: refs/heads/master v: v3
git-mirror · May 3, 2009 · 5c5cec7 · 5c5cec7
1 parent efb0386
commit 5c5cec7
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dec56e6312434b2536fedf9d7e9e73d666aaf0a8
+refs/heads/master: 25483efeb2e56521e418a59fa93401be156dc3bb
diff --git a/trunk/arch/sh/kernel/Makefile_32 b/trunk/arch/sh/kernel/Makefile_32
@@ -32,4 +32,6 @@ obj-$(CONFIG_DYNAMIC_FTRACE)	+= ftrace.o
 obj-$(CONFIG_DUMP_CODE)		+= disassemble.o
 obj-$(CONFIG_HIBERNATION)	+= swsusp.o
 
+obj-$(CONFIG_GENERIC_CLOCKEVENTS_BROADCAST)	+= localtimer.o
+
 EXTRA_CFLAGS += -Werror
diff --git a/trunk/arch/sh/kernel/Makefile_64 b/trunk/arch/sh/kernel/Makefile_64
@@ -17,4 +17,6 @@ obj-$(CONFIG_STACKTRACE)	+= stacktrace.o
 obj-$(CONFIG_IO_TRAPPED)	+= io_trapped.o
 obj-$(CONFIG_GENERIC_GPIO)	+= gpio.o
 
+obj-$(CONFIG_GENERIC_CLOCKEVENTS_BROADCAST)	+= localtimer.o
+
 EXTRA_CFLAGS += -Werror
diff --git a/...k/arch/sh/kernel/timers/timer-broadcast.c → trunk/arch/sh/kernel/localtimer.c b/...k/arch/sh/kernel/timers/timer-broadcast.c → trunk/arch/sh/kernel/localtimer.c
diff --git a/trunk/arch/sh/kernel/timers/Makefile b/trunk/arch/sh/kernel/timers/Makefile
@@ -5,5 +5,3 @@
 obj-y	:= timer.o
 
 obj-$(CONFIG_SH_TMU)		+= timer-tmu.o
-
-obj-$(CONFIG_GENERIC_CLOCKEVENTS_BROADCAST)	+= timer-broadcast.o
Original file line number	Diff line number	Diff line change
Expand Up		@@ -5,5 +5,3 @@
		obj-y := timer.o

		obj-$(CONFIG_SH_TMU) += timer-tmu.o

		obj-$(CONFIG_GENERIC_CLOCKEVENTS_BROADCAST) += timer-broadcast.o