aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPankaj Dubey <pankaj.dubey@samsung.com>2014-01-24 08:23:08 +0000
committerAlex Shi <alex.shi@linaro.org>2014-04-21 21:08:32 +0800
commit54a9256c2ecaa741bfe469a89ebfe4399af16be6 (patch)
treeec904999d3b319254bb408bada5cb961a3a692fb
parentf2487bb3cb4a090c23a973042cea337ff244bfd6 (diff)
downloadlinux-linaro-stable-54a9256c2ecaa741bfe469a89ebfe4399af16be6.tar.gz
arm64: fix build error if DMA_CMA is enabled
arm64/include/asm/dma-contiguous.h is trying to include <asm-genric/dma-contiguous.h> which does not exist, and thus failing build for arm64 if we enable CONFIG_DMA_CMA. This patch fixes build error by removing unwanted header inclusion from arm64's dma-contiguous.h. Signed-off-by: Pankaj Dubey <pankaj.dubey@samsung.com> Signed-off-by: Somraj Mani <somraj.mani@samsung.com> Acked-by: Laura Abbott <lauraa@codeaurora.org> Signed-off-by: Catalin Marinas <catalin.marinas@arm.com> (cherry picked from commit ac525f59fb011e05e77c5be8b9834883ee1d5613) Signed-off-by: Alex Shi <alex.shi@linaro.org>
-rw-r--r--arch/arm64/include/asm/dma-contiguous.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm64/include/asm/dma-contiguous.h b/arch/arm64/include/asm/dma-contiguous.h
index d6aacb61ff4a..14c4c0ca7f2a 100644
--- a/arch/arm64/include/asm/dma-contiguous.h
+++ b/arch/arm64/include/asm/dma-contiguous.h
@@ -18,7 +18,6 @@
#ifdef CONFIG_DMA_CMA
#include <linux/types.h>
-#include <asm-generic/dma-contiguous.h>
static inline void
dma_contiguous_early_fixup(phys_addr_t base, unsigned long size) { }