ia64: fix build failure with CONFIG_SWIOTLB

"Linux Kernel Mailing List" <[email protected]> Fri, 16 Feb 2018 20:48:25 +0000 (UTC)
Newsgroups gmane.linux.kernel.commits.head
Message-ID <[email protected]>
Web:        https://git.kernel.org/torvalds/c/9d37c094dacda531ac3e529dd4dd139e3c0b7811
Commit:     9d37c094dacda531ac3e529dd4dd139e3c0b7811
Parent:     7928b2cbe55b2a410a0f5c1f154610059c57b1b2
Refname:    refs/heads/master
Author:     Corentin Labbe <[email protected]>
AuthorDate: Thu Feb 8 19:39:20 2018 +0000
Committer:  Christoph Hellwig <[email protected]>
CommitDate: Mon Feb 12 15:59:05 2018 +0000

    ia64: fix build failure with CONFIG_SWIOTLB
    
    arch/ia64/kernel/pci-swiotlb.c is removed in commit 4fac8076df85 ("ia64: clean up swiotlb support")
    but pci-swiotlb.o is still present in Makefile, and so build fail when
    CONFIG_SWIOTLB is enabled.
    Fix the build failure by removing pci-swiotlb.o from makefile
    
    Fixes: 4fac8076df85 ("ia64: clean up swiotlb support")
    Signed-off-by: Corentin Labbe <[email protected]>
    Signed-off-by: Christoph Hellwig <[email protected]>
---
 arch/ia64/kernel/Makefile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/arch/ia64/kernel/Makefile b/arch/ia64/kernel/Makefile
index 0b4c65a1af25..498f3da3f225 100644
--- a/arch/ia64/kernel/Makefile
+++ b/arch/ia64/kernel/Makefile
@@ -41,7 +41,6 @@ ifneq ($(CONFIG_IA64_ESI),)
 obj-y				+= esi_stub.o	# must be in kernel proper
 endif
 obj-$(CONFIG_INTEL_IOMMU)	+= pci-dma.o
-obj-$(CONFIG_SWIOTLB)		+= pci-swiotlb.o
 
 obj-$(CONFIG_BINFMT_ELF)	+= elfcore.o
 
--
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html