From b44419bfd68c316826d824c6c91a74c6b5276126 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Thu, 11 Oct 2007 11:14:10 +0200 Subject: [PATCH] --- yaml --- r: 65451 b: refs/heads/master c: 2a8eb13a0689439eb9c34be062e6a5284832bb02 h: refs/heads/master i: 65449: 9098c16d5cb4126b36c8edc2e6afdbc21d3e84b6 65447: 4d8386d8e49fe58a2d55b8a8809a7a088b5272a5 v: v3 --- [refs] | 2 +- trunk/arch/x86_64/kernel/Makefile | 2 +- trunk/arch/x86_64/kernel/{pci-calgary.c => pci-calgary_64.c} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename trunk/arch/x86_64/kernel/{pci-calgary.c => pci-calgary_64.c} (100%) diff --git a/[refs] b/[refs] index 1251b70b9886..23f55077b62c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cc7de6036cd93d5ca7228fe8ca921b6dc9050c83 +refs/heads/master: 2a8eb13a0689439eb9c34be062e6a5284832bb02 diff --git a/trunk/arch/x86_64/kernel/Makefile b/trunk/arch/x86_64/kernel/Makefile index 89a62b75dca4..d71bbfb2dd10 100644 --- a/trunk/arch/x86_64/kernel/Makefile +++ b/trunk/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/trunk/arch/x86_64/kernel/pci-calgary.c b/trunk/arch/x86_64/kernel/pci-calgary_64.c similarity index 100% rename from trunk/arch/x86_64/kernel/pci-calgary.c rename to trunk/arch/x86_64/kernel/pci-calgary_64.c