---

yaml --- r: 65483 b: refs/heads/master c: abb1183 h: refs/heads/master i: 65481: 23d831b 65479: cfb85f0 v: v3
git-mirror · Oct 11, 2007 · eae22d2 · eae22d2
1 parent d484c89
commit eae22d2
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 96a6674c5ad6a6f596aab6ac826b93f5cd846749
+refs/heads/master: abb11834c6515161babea211a7be1fc6dcb893dc
diff --git a/trunk/arch/x86_64/kernel/Makefile b/trunk/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/trunk/arch/x86_64/kernel/time.c → trunk/arch/x86_64/kernel/time_64.c b/trunk/arch/x86_64/kernel/time.c → trunk/arch/x86_64/kernel/time_64.c