From 0e1bc64a67064f38fb66ca6a2f625d4eeb77ec51 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Thu, 11 Oct 2007 11:14:36 +0200 Subject: [PATCH] --- yaml --- r: 65470 b: refs/heads/master c: e86a989de27d4c0226928d6132f284f6156f30f7 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86_64/kernel/Makefile | 2 +- trunk/arch/x86_64/kernel/{tce.c => tce_64.c} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename trunk/arch/x86_64/kernel/{tce.c => tce_64.c} (100%) diff --git a/[refs] b/[refs] index 7c46a0829e29..ac53f9d56b19 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2cf08fa82161bf398c1a6321d738a45730b0acd2 +refs/heads/master: e86a989de27d4c0226928d6132f284f6156f30f7 diff --git a/trunk/arch/x86_64/kernel/Makefile b/trunk/arch/x86_64/kernel/Makefile index 7918fee8b9b3..4702333f93b1 100644 --- a/trunk/arch/x86_64/kernel/Makefile +++ b/trunk/arch/x86_64/kernel/Makefile @@ -30,7 +30,7 @@ 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_64.o -obj-$(CONFIG_CALGARY_IOMMU) += pci-calgary_64.o tce.o +obj-$(CONFIG_CALGARY_IOMMU) += pci-calgary_64.o tce_64.o obj-$(CONFIG_SWIOTLB) += pci-swiotlb.o obj-$(CONFIG_KPROBES) += kprobes.o obj-$(CONFIG_X86_PM_TIMER) += pmtimer.o diff --git a/trunk/arch/x86_64/kernel/tce.c b/trunk/arch/x86_64/kernel/tce_64.c similarity index 100% rename from trunk/arch/x86_64/kernel/tce.c rename to trunk/arch/x86_64/kernel/tce_64.c