---

yaml --- r: 146721 b: refs/heads/master c: b179b72 h: refs/heads/master i: 146719: 801d479 v: v3
git-mirror · May 8, 2009 · 1dd9d96 · 1dd9d96
1 parent e913782
commit 1dd9d96
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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 → trunk/arch/sh/kernel/time.c b/trunk/arch/sh/kernel/time_32.c → trunk/arch/sh/kernel/time.c