From 8861dbac509be70a536c98f504b4d56c7bd1ccd8 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Thu, 11 Oct 2007 11:15:23 +0200 Subject: [PATCH] --- yaml --- r: 65503 b: refs/heads/master c: 46b4c119b4b67dfab3f1e644d6f8bdbf28f18411 h: refs/heads/master i: 65501: 17c7384d7b75a17cb2ecb22951eeeb4be326caa4 65499: 66502c385cd8ee41475fc78806b4e0b379968293 65495: c1f278eac36d14c8544271d4165284bf9599334c 65487: f48be42e5bddff4c4d1022f616246d223c66fb45 65471: cb429ddd9feb50a07b9bc41d85d84b18b3d70141 v: v3 --- [refs] | 2 +- trunk/arch/x86_64/kernel/Makefile | 2 +- trunk/arch/x86_64/kernel/{pci-gart.c => pci-gart_64.c} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename trunk/arch/x86_64/kernel/{pci-gart.c => pci-gart_64.c} (100%) diff --git a/[refs] b/[refs] index 75c9253c32c3..0388c58b1286 100644 --- 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 index 2336f1cb654c..8253617af12e 100644 --- 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 b/trunk/arch/x86_64/kernel/pci-gart_64.c similarity index 100% rename from trunk/arch/x86_64/kernel/pci-gart.c rename to trunk/arch/x86_64/kernel/pci-gart_64.c