---

yaml --- r: 65463 b: refs/heads/master c: 3940abd h: refs/heads/master i: 65461: 5bdda07 65459: 33b0757 65455: 392fe40 v: v3
git-mirror · Oct 11, 2007 · 150fa6f · 150fa6f
1 parent 5057d45
commit 150fa6f
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: 5b8d883929091c647635392bafc8fc0962d4b43f
+refs/heads/master: 3940abdf5e7f62bf47c4117f9201c121fbb0ab16
diff --git a/trunk/arch/x86_64/kernel/Makefile b/trunk/arch/x86_64/kernel/Makefile
@@ -8,7 +8,7 @@ obj-y	:= process.o signal.o entry.o traps_64.o irq.o \
 		ptrace.o time.o ioport.o ldt.o setup.o i8259_64.o sys_x86_64.o \
 		x8664_ksyms.o i387.o syscall.o vsyscall.o \
 		setup64.o bootflag.o e820.o reboot.o quirks.o i8237.o \
-		pci-dma_64.o pci-nommu.o alternative.o hpet.o tsc.o bugs.o \
+		pci-dma_64.o pci-nommu.o alternative.o hpet_64.o tsc.o bugs.o \
 		perfctr-watchdog.o
 
 obj-$(CONFIG_STACKTRACE)	+= stacktrace.o

diff --git a/trunk/arch/x86_64/kernel/hpet.c → trunk/arch/x86_64/kernel/hpet_64.c b/trunk/arch/x86_64/kernel/hpet.c → trunk/arch/x86_64/kernel/hpet_64.c