From 9098c16d5cb4126b36c8edc2e6afdbc21d3e84b6 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Thu, 11 Oct 2007 11:14:07 +0200 Subject: [PATCH] --- yaml --- r: 65449 b: refs/heads/master c: 6ba77c2d762ccac01dc9302c63e21605552f177e h: refs/heads/master i: 65447: 4d8386d8e49fe58a2d55b8a8809a7a088b5272a5 v: v3 --- [refs] | 2 +- trunk/arch/x86_64/kernel/Makefile | 2 +- trunk/arch/x86_64/kernel/{aperture.c => aperture_64.c} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename trunk/arch/x86_64/kernel/{aperture.c => aperture_64.c} (100%) diff --git a/[refs] b/[refs] index be0bf02eb780..9ba1db58beae 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 76acb5c02fce49c6efcaa30dd9374753191b3f8e +refs/heads/master: 6ba77c2d762ccac01dc9302c63e21605552f177e diff --git a/trunk/arch/x86_64/kernel/Makefile b/trunk/arch/x86_64/kernel/Makefile index b865ce6e94f2..175d6045d36b 100644 --- a/trunk/arch/x86_64/kernel/Makefile +++ b/trunk/arch/x86_64/kernel/Makefile @@ -29,7 +29,7 @@ obj-$(CONFIG_PM) += suspend.o obj-$(CONFIG_HIBERNATION) += suspend_asm.o obj-$(CONFIG_CPU_FREQ) += ../../i386/kernel/cpu/cpufreq/ obj-$(CONFIG_EARLY_PRINTK) += early_printk.o -obj-$(CONFIG_IOMMU) += pci-gart.o aperture.o +obj-$(CONFIG_IOMMU) += pci-gart.o aperture_64.o obj-$(CONFIG_CALGARY_IOMMU) += pci-calgary.o tce.o obj-$(CONFIG_SWIOTLB) += pci-swiotlb.o obj-$(CONFIG_KPROBES) += kprobes.o diff --git a/trunk/arch/x86_64/kernel/aperture.c b/trunk/arch/x86_64/kernel/aperture_64.c similarity index 100% rename from trunk/arch/x86_64/kernel/aperture.c rename to trunk/arch/x86_64/kernel/aperture_64.c