---

yaml --- r: 65470 b: refs/heads/master c: e86a989 h: refs/heads/master v: v3
git-mirror · Oct 11, 2007 · 0e1bc64 · 0e1bc64
1 parent 8763109
commit 0e1bc64
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: 2cf08fa82161bf398c1a6321d738a45730b0acd2
+refs/heads/master: e86a989de27d4c0226928d6132f284f6156f30f7
diff --git 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 → trunk/arch/x86_64/kernel/tce_64.c b/trunk/arch/x86_64/kernel/tce.c → trunk/arch/x86_64/kernel/tce_64.c