---

yaml --- r: 65449 b: refs/heads/master c: 6ba77c2 h: refs/heads/master i: 65447: 4d8386d v: v3
git-mirror · Oct 11, 2007 · 9098c16 · 9098c16
1 parent ebd3eb1
commit 9098c16
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: 76acb5c02fce49c6efcaa30dd9374753191b3f8e
+refs/heads/master: 6ba77c2d762ccac01dc9302c63e21605552f177e
diff --git 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 → trunk/arch/x86_64/kernel/aperture_64.c b/trunk/arch/x86_64/kernel/aperture.c → trunk/arch/x86_64/kernel/aperture_64.c