From a140a8d7fa6df933094dc0cf21e87a812c38ec01 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Thu, 11 Oct 2007 11:14:50 +0200 Subject: [PATCH] --- yaml --- r: 65480 b: refs/heads/master c: 93de1ef4543e80a1a9bfdb7a854d155f6530df2e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86_64/kernel/Makefile | 2 +- trunk/arch/x86_64/kernel/{pmtimer.c => pmtimer_64.c} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename trunk/arch/x86_64/kernel/{pmtimer.c => pmtimer_64.c} (100%) diff --git a/[refs] b/[refs] index df8a8169fdc5..23b00bad9c9f 100644 --- 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 index 1af0839b8d3f..9939968285ed 100644 --- 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 b/trunk/arch/x86_64/kernel/pmtimer_64.c similarity index 100% rename from trunk/arch/x86_64/kernel/pmtimer.c rename to trunk/arch/x86_64/kernel/pmtimer_64.c