---

yaml --- r: 138903 b: refs/heads/master c: b041cf2 h: refs/heads/master i: 138901: baedda4 138899: a9d33fd 138895: 91c00e4 v: v3
git-mirror · Jan 23, 2009 · 56fce3b · 56fce3b
1 parent 20ddfdc
commit 56fce3b
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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 → trunk/arch/x86/kernel/pci-swiotlb.c b/trunk/arch/x86/kernel/pci-swiotlb_64.c → trunk/arch/x86/kernel/pci-swiotlb.c