From 1dd9d9690c2142d425a77b3001d8189d237775a4 Mon Sep 17 00:00:00 2001 From: Paul Mundt Date: Fri, 8 May 2009 16:17:36 +0900 Subject: [PATCH] --- yaml --- r: 146721 b: refs/heads/master c: b179b72fad5c88c3b616fb88a9ae7cbbc1a750d3 h: refs/heads/master i: 146719: 801d4791a3dd9099b833863d4622d82859717e0d v: v3 --- [refs] | 2 +- trunk/arch/sh/kernel/Makefile_32 | 2 +- trunk/arch/sh/kernel/Makefile_64 | 2 +- trunk/arch/sh/kernel/{time_32.c => time.c} | 0 4 files changed, 3 insertions(+), 3 deletions(-) rename trunk/arch/sh/kernel/{time_32.c => time.c} (100%) diff --git a/[refs] b/[refs] index 8c9b867a574d..206bf0309a38 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: add47067a8ca324e9d26c4373350dc3cce7f1e7f +refs/heads/master: b179b72fad5c88c3b616fb88a9ae7cbbc1a750d3 diff --git a/trunk/arch/sh/kernel/Makefile_32 b/trunk/arch/sh/kernel/Makefile_32 index 5b1d4d0fe04d..aee08afe5ff7 100644 --- a/trunk/arch/sh/kernel/Makefile_32 +++ b/trunk/arch/sh/kernel/Makefile_32 @@ -11,7 +11,7 @@ endif obj-y := debugtraps.o idle.o io.o io_generic.o irq.o \ machvec.o process_32.o ptrace_32.o setup.o signal_32.o \ - sys_sh.o sys_sh32.o syscalls_32.o time_32.o topology.o \ + sys_sh.o sys_sh32.o syscalls_32.o time.o topology.o \ traps.o traps_32.o obj-y += cpu/ timers/ diff --git a/trunk/arch/sh/kernel/Makefile_64 b/trunk/arch/sh/kernel/Makefile_64 index 4667d4cac953..31f6ebf375eb 100644 --- a/trunk/arch/sh/kernel/Makefile_64 +++ b/trunk/arch/sh/kernel/Makefile_64 @@ -2,7 +2,7 @@ extra-y := head_64.o init_task.o vmlinux.lds obj-y := debugtraps.o idle.o io.o io_generic.o irq.o machvec.o process_64.o \ ptrace_64.o setup.o signal_64.o sys_sh.o sys_sh64.o \ - syscalls_64.o time_32.o topology.o traps.o traps_64.o + syscalls_64.o time.o topology.o traps.o traps_64.o obj-y += cpu/ timers/ obj-$(CONFIG_VSYSCALL) += vsyscall/ diff --git a/trunk/arch/sh/kernel/time_32.c b/trunk/arch/sh/kernel/time.c similarity index 100% rename from trunk/arch/sh/kernel/time_32.c rename to trunk/arch/sh/kernel/time.c