---

yaml --- r: 65498 b: refs/heads/master c: 13c4896 h: refs/heads/master v: v3
git-mirror · Oct 11, 2007 · 9f53dcb · 9f53dcb
1 parent afbd90b
commit 9f53dcb
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: 8e59c31a0af824ddb158a7007faa66fc8ca4dbe4
+refs/heads/master: 13c4896799d1610956f307534aa22d644b92bee7
diff --git a/trunk/arch/x86_64/kernel/Makefile b/trunk/arch/x86_64/kernel/Makefile
@@ -8,7 +8,7 @@ obj-y	:= process_64.o signal_64.o entry_64.o traps_64.o irq_64.o \
 		ptrace_64.o time_64.o ioport_64.o ldt_64.o setup_64.o i8259_64.o sys_x86_64.o \
 		x8664_ksyms_64.o i387_64.o syscall.o vsyscall_64.o \
 		setup64.o bootflag.o e820_64.o reboot_64.o quirks.o i8237.o \
-		pci-dma_64.o pci-nommu_64.o alternative.o hpet_64.o tsc.o bugs_64.o \
+		pci-dma_64.o pci-nommu_64.o alternative.o hpet_64.o tsc_64.o bugs_64.o \
 		perfctr-watchdog.o
 
 obj-$(CONFIG_STACKTRACE)	+= stacktrace.o

diff --git a/trunk/arch/x86_64/kernel/tsc.c → trunk/arch/x86_64/kernel/tsc_64.c b/trunk/arch/x86_64/kernel/tsc.c → trunk/arch/x86_64/kernel/tsc_64.c