---

yaml --- r: 65480 b: refs/heads/master c: 93de1ef h: refs/heads/master v: v3
git-mirror · Oct 11, 2007 · a140a8d · a140a8d
1 parent cfb85f0
commit a140a8d
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: 1a333ab079458b8ca58ebb761ebca48b7fc9ab5c
+refs/heads/master: 93de1ef4543e80a1a9bfdb7a854d155f6530df2e
diff --git a/trunk/arch/x86_64/kernel/Makefile b/trunk/arch/x86_64/kernel/Makefile
@@ -33,7 +33,7 @@ obj-$(CONFIG_IOMMU)		+= pci-gart.o aperture_64.o
 obj-$(CONFIG_CALGARY_IOMMU)	+= pci-calgary_64.o tce_64.o
 obj-$(CONFIG_SWIOTLB)		+= pci-swiotlb_64.o
 obj-$(CONFIG_KPROBES)		+= kprobes.o
-obj-$(CONFIG_X86_PM_TIMER)	+= pmtimer.o
+obj-$(CONFIG_X86_PM_TIMER)	+= pmtimer_64.o
 obj-$(CONFIG_X86_VSMP)		+= vsmp_64.o
 obj-$(CONFIG_K8_NB)		+= k8.o
 obj-$(CONFIG_AUDIT)		+= audit.o

diff --git a/trunk/arch/x86_64/kernel/pmtimer.c → trunk/arch/x86_64/kernel/pmtimer_64.c b/trunk/arch/x86_64/kernel/pmtimer.c → trunk/arch/x86_64/kernel/pmtimer_64.c