diff options
| author | Pankaj Dubey <pankaj.dubey@samsung.com> | 2014-01-24 03:23:08 -0500 |
|---|---|---|
| committer | Catalin Marinas <catalin.marinas@arm.com> | 2014-01-27 07:00:25 -0500 |
| commit | ac525f59fb011e05e77c5be8b9834883ee1d5613 (patch) | |
| tree | 20aa52d77408f3dee0292f9a425c3e79e3244773 | |
| parent | fb4a96029c8a091c4365f57307e098543b48a222 (diff) | |
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>
| -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 @@ | |||
| 18 | #ifdef CONFIG_DMA_CMA | 18 | #ifdef CONFIG_DMA_CMA |
| 19 | 19 | ||
| 20 | #include <linux/types.h> | 20 | #include <linux/types.h> |
| 21 | #include <asm-generic/dma-contiguous.h> | ||
| 22 | 21 | ||
| 23 | static inline void | 22 | static inline void |
| 24 | dma_contiguous_early_fixup(phys_addr_t base, unsigned long size) { } | 23 | dma_contiguous_early_fixup(phys_addr_t base, unsigned long size) { } |