summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2009-05-08 16:17:36 +0900
committerPaul Mundt <lethal@linux-sh.org>2009-05-08 16:17:36 +0900
commitb179b72fad5c88c3b616fb88a9ae7cbbc1a750d3 (patch)
tree705f19b9756654e8799191e1c3d7ea3b2b4e812d
parentadd47067a8ca324e9d26c4373350dc3cce7f1e7f (diff)
downloadlinux-b179b72fad5c88c3b616fb88a9ae7cbbc1a750d3.tar.bz2
sh: Rename arch/sh/kernel/time_32.c to arch/sh/kernel/time.c.
This is now fully generic, and used both by _32 and _64 variants. Rename it accordingly. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
-rw-r--r--arch/sh/kernel/Makefile_322
-rw-r--r--arch/sh/kernel/Makefile_642
-rw-r--r--arch/sh/kernel/time.c (renamed from arch/sh/kernel/time_32.c)0
3 files changed, 2 insertions, 2 deletions
diff --git a/arch/sh/kernel/Makefile_32 b/arch/sh/kernel/Makefile_32
index 5b1d4d0fe04d..aee08afe5ff7 100644
--- a/arch/sh/kernel/Makefile_32
+++ b/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/arch/sh/kernel/Makefile_64 b/arch/sh/kernel/Makefile_64
index 4667d4cac953..31f6ebf375eb 100644
--- a/arch/sh/kernel/Makefile_64
+++ b/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/arch/sh/kernel/time_32.c b/arch/sh/kernel/time.c
index d41ca4cf20cf..d41ca4cf20cf 100644
--- a/arch/sh/kernel/time_32.c
+++ b/arch/sh/kernel/time.c