From 56fce3b129740b9825767a147e616ae3a7e76643 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Fri, 23 Jan 2009 10:56:16 +0000 Subject: [PATCH] --- yaml --- r: 138903 b: refs/heads/master c: b041cf22ddb742874040d0a3259d0be46f3d3a4b h: refs/heads/master i: 138901: baedda4a8e9741fb9dd48e7ca6a08d58795b78f4 138899: a9d33fd402e11a314c34b1197fd5a66be1a9ad48 138895: 91c00e49835941013b6cb466c60438f82c378f38 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/Makefile | 2 +- trunk/arch/x86/kernel/{pci-swiotlb_64.c => pci-swiotlb.c} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename trunk/arch/x86/kernel/{pci-swiotlb_64.c => pci-swiotlb.c} (100%) diff --git a/[refs] b/[refs] index 6b7d5ea6f3b1..7e63444173a4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: af2519fb2298cdf7540082c36f4d8c66bbff103f +refs/heads/master: b041cf22ddb742874040d0a3259d0be46f3d3a4b diff --git a/trunk/arch/x86/kernel/Makefile b/trunk/arch/x86/kernel/Makefile index d364df03c1d6..bb1eef62d8f0 100644 --- a/trunk/arch/x86/kernel/Makefile +++ b/trunk/arch/x86/kernel/Makefile @@ -109,7 +109,7 @@ obj-$(CONFIG_MICROCODE) += microcode.o obj-$(CONFIG_X86_CHECK_BIOS_CORRUPTION) += check.o -obj-$(CONFIG_SWIOTLB) += pci-swiotlb_64.o # NB rename without _64 +obj-$(CONFIG_SWIOTLB) += pci-swiotlb.o ### # 64 bit specific files diff --git a/trunk/arch/x86/kernel/pci-swiotlb_64.c b/trunk/arch/x86/kernel/pci-swiotlb.c similarity index 100% rename from trunk/arch/x86/kernel/pci-swiotlb_64.c rename to trunk/arch/x86/kernel/pci-swiotlb.c