arm64: fix build error if DMA_CMA is enabled
authorPankaj Dubey <pankaj.dubey@samsung.com>
Fri, 24 Jan 2014 08:23:08 +0000 (08:23 +0000)
committerAlex Shi <alex.shi@linaro.org>
Mon, 21 Apr 2014 13:08:32 +0000 (21:08 +0800)
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>
arch/arm64/include/asm/dma-contiguous.h

index d6aacb61ff4ae19de6fdf46607b5c0d5e8ff221e..14c4c0ca7f2a217851219355040c017cfe4a87a2 100644 (file)
@@ -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) { }