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