aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86_64
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2007-10-11 11:14:10 +0200
committerThomas Gleixner <tglx@linutronix.de>2007-10-11 11:14:10 +0200
commit2a8eb13a0689439eb9c34be062e6a5284832bb02 (patch)
tree400ce42eeff27200ac8e4013def20784eb8f8c11 /arch/x86_64
parentcc7de6036cd93d5ca7228fe8ca921b6dc9050c83 (diff)
downloadkernel_samsung_smdk4412-2a8eb13a0689439eb9c34be062e6a5284832bb02.zip
kernel_samsung_smdk4412-2a8eb13a0689439eb9c34be062e6a5284832bb02.tar.gz
kernel_samsung_smdk4412-2a8eb13a0689439eb9c34be062e6a5284832bb02.tar.bz2
x86_64: prepare shared kernel/pci-calgary.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/pci-calgary_64.c (renamed from arch/x86_64/kernel/pci-calgary.c)0
2 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86_64/kernel/Makefile b/arch/x86_64/kernel/Makefile
index 89a62b7..d71bbfb 100644
--- a/arch/x86_64/kernel/Makefile
+++ b/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.o tce.o
+obj-$(CONFIG_CALGARY_IOMMU) += pci-calgary_64.o tce.o
obj-$(CONFIG_SWIOTLB) += pci-swiotlb.o
obj-$(CONFIG_KPROBES) += kprobes.o
obj-$(CONFIG_X86_PM_TIMER) += pmtimer.o
diff --git a/arch/x86_64/kernel/pci-calgary.c b/arch/x86_64/kernel/pci-calgary_64.c
index 71da01e..71da01e 100644
--- a/arch/x86_64/kernel/pci-calgary.c
+++ b/arch/x86_64/kernel/pci-calgary_64.c