Merge branch 'linus' into core/iommu

[linux-2.6-omap-h63xx.git] / arch / x86 / kernel / Makefile

diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
index 95f216bbfaf16f6b8572c40c4cdfa756758f6be5..1fc811b3b8551bd228336a5410fcf96276db1a48 100644 (file)
--- a/arch/x86/kernel/Makefile
+++ b/arch/x86/kernel/Makefile
@@ -106,7 +106,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