From 5c5cec73b75bb0349b43dd3b12969f1caeda435c Mon Sep 17 00:00:00 2001 From: Paul Mundt Date: Sun, 3 May 2009 18:29:27 +0900 Subject: [PATCH] --- yaml --- r: 146708 b: refs/heads/master c: 25483efeb2e56521e418a59fa93401be156dc3bb h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/sh/kernel/Makefile_32 | 2 ++ trunk/arch/sh/kernel/Makefile_64 | 2 ++ trunk/arch/sh/kernel/{timers/timer-broadcast.c => localtimer.c} | 0 trunk/arch/sh/kernel/timers/Makefile | 2 -- 5 files changed, 5 insertions(+), 3 deletions(-) rename trunk/arch/sh/kernel/{timers/timer-broadcast.c => localtimer.c} (100%) diff --git a/[refs] b/[refs] index 5833b4ff76d2..32c1c7ca719a 100644 --- 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 index 82a3a150c00d..5b1d4d0fe04d 100644 --- 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 index fe425d7f6871..d256c7746957 100644 --- 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/trunk/arch/sh/kernel/timers/timer-broadcast.c b/trunk/arch/sh/kernel/localtimer.c similarity index 100% rename from trunk/arch/sh/kernel/timers/timer-broadcast.c rename to trunk/arch/sh/kernel/localtimer.c diff --git a/trunk/arch/sh/kernel/timers/Makefile b/trunk/arch/sh/kernel/timers/Makefile index 44156df0bdea..8bceba59e76f 100644 --- 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