---

yaml --- r: 65475 b: refs/heads/master c: 4f1124c h: refs/heads/master i: 65473: a619ae6 65471: cb429dd v: v3
git-mirror · Oct 11, 2007 · 72b3f90 · 72b3f90
1 parent f5b645c
commit 72b3f90
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: eb102ecb73dffbbbdfccd0ea582f405b0c0cc1fe
+refs/heads/master: 4f1124c5bcc5e0b139930d98687db80fd4d67a1c
diff --git a/trunk/arch/x86_64/kernel/Makefile b/trunk/arch/x86_64/kernel/Makefile
@@ -31,7 +31,7 @@ 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_64.o
-obj-$(CONFIG_SWIOTLB)		+= pci-swiotlb.o
+obj-$(CONFIG_SWIOTLB)		+= pci-swiotlb_64.o
 obj-$(CONFIG_KPROBES)		+= kprobes.o
 obj-$(CONFIG_X86_PM_TIMER)	+= pmtimer.o
 obj-$(CONFIG_X86_VSMP)		+= vsmp.o

diff --git a/trunk/arch/x86_64/kernel/pci-swiotlb.c → trunk/arch/x86_64/kernel/pci-swiotlb_64.c b/trunk/arch/x86_64/kernel/pci-swiotlb.c → trunk/arch/x86_64/kernel/pci-swiotlb_64.c