diff options
| author | Pankaj Dubey <pankaj.dubey@samsung.com> | 2014-01-24 08:23:08 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-05-05 16:02:14 -0700 |
| commit | 9d93ccedc26f8591ca4e6f2b65dcbf2bdbfd6453 (patch) | |
| tree | a972d28d1eea0203fe88d382890840f701895052 | |
| parent | 97e4a880c9677b82ddb41e4613d0d4b6a3479a80 (diff) | |
| download | linux-linaro-stable-9d93ccedc26f8591ca4e6f2b65dcbf2bdbfd6453.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.h | 1 |
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) { } |