aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86_64
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2007-10-11 11:14:07 +0200
committerThomas Gleixner <tglx@linutronix.de>2007-10-11 11:14:07 +0200
commit6ba77c2d762ccac01dc9302c63e21605552f177e (patch)
treedad37331b6140b6e2a90a54def9ed7bfd1ab0347 /arch/x86_64
parent76acb5c02fce49c6efcaa30dd9374753191b3f8e (diff)
downloadkernel_samsung_smdk4412-6ba77c2d762ccac01dc9302c63e21605552f177e.zip
kernel_samsung_smdk4412-6ba77c2d762ccac01dc9302c63e21605552f177e.tar.gz
kernel_samsung_smdk4412-6ba77c2d762ccac01dc9302c63e21605552f177e.tar.bz2
x86_64: prepare shared kernel/aperture.c
Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86_64')
-rw-r--r--arch/x86_64/kernel/Makefile2
-rw-r--r--arch/x86_64/kernel/aperture_64.c (renamed from arch/x86_64/kernel/aperture.c)0
2 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86_64/kernel/Makefile b/arch/x86_64/kernel/Makefile
index b865ce6..175d604 100644
--- a/arch/x86_64/kernel/Makefile
+++ b/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/arch/x86_64/kernel/aperture.c b/arch/x86_64/kernel/aperture_64.c
index 8f681ca..8f681ca 100644
--- a/arch/x86_64/kernel/aperture.c
+++ b/arch/x86_64/kernel/aperture_64.c