---

yaml --- r: 65503 b: refs/heads/master c: 46b4c11 h: refs/heads/master i: 65501: 17c7384 65499: 66502c3 65495: c1f278e 65487: f48be42 65471: cb429dd v: v3
git-mirror · Oct 11, 2007 · 8861dba · 8861dba
1 parent e74c3d8
commit 8861dba
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: f328f81b54ecc19d2d13710dca01e5f01f1ff449
+refs/heads/master: 46b4c119b4b67dfab3f1e644d6f8bdbf28f18411
diff --git a/trunk/arch/x86_64/kernel/Makefile b/trunk/arch/x86_64/kernel/Makefile
@@ -29,7 +29,7 @@ obj-$(CONFIG_PM)		+= suspend_64.o
 obj-$(CONFIG_HIBERNATION)	+= suspend_asm_64.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_IOMMU)		+= pci-gart_64.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_64.o

diff --git a/trunk/arch/x86_64/kernel/pci-gart.c → trunk/arch/x86_64/kernel/pci-gart_64.c b/trunk/arch/x86_64/kernel/pci-gart.c → trunk/arch/x86_64/kernel/pci-gart_64.c