aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2007-10-11 11:14:54 +0200
committerThomas Gleixner <tglx@linutronix.de>2007-10-11 11:14:54 +0200
commitabb11834c6515161babea211a7be1fc6dcb893dc (patch)
tree0c3101e18acd60aea9454e7bb26df1db96257de2
parent96a6674c5ad6a6f596aab6ac826b93f5cd846749 (diff)
x86_64: prepare shared kernel/time.c
Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--arch/x86_64/kernel/Makefile2
-rw-r--r--arch/x86_64/kernel/time_64.c (renamed from arch/x86_64/kernel/time.c)0
2 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86_64/kernel/Makefile b/arch/x86_64/kernel/Makefile
index b0a29b51042..1c9ae60f0bf 100644
--- a/arch/x86_64/kernel/Makefile
+++ b/arch/x86_64/kernel/Makefile
@@ -5,7 +5,7 @@
extra-y := head.o head64.o init_task.o vmlinux.lds
EXTRA_AFLAGS := -traditional
obj-y := process.o signal_64.o entry.o traps_64.o irq.o \
- ptrace.o time.o ioport_64.o ldt.o setup_64.o i8259_64.o sys_x86_64.o \
+ ptrace.o time_64.o ioport_64.o ldt.o setup_64.o i8259_64.o sys_x86_64.o \
x8664_ksyms.o i387_64.o syscall.o vsyscall_64.o \
setup64.o bootflag.o e820_64.o reboot.o quirks.o i8237.o \
pci-dma_64.o pci-nommu_64.o alternative.o hpet_64.o tsc.o bugs_64.o \
diff --git a/arch/x86_64/kernel/time.c b/arch/x86_64/kernel/time_64.c
index 6d48a4e826d..6d48a4e826d 100644
--- a/arch/x86_64/kernel/time.c
+++ b/arch/x86_64/kernel/time_64.c