aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorChen Gang <gang.chen.5i5j@gmail.com>2013-11-18 23:57:27 -0500
committerRichard Kuo <rkuo@codeaurora.org>2014-04-04 19:19:59 -0400
commit568210f042dc143c93851a3a5bb2f854916396c9 (patch)
treeaf742cf11f686f68b452a6990a21108177c44233 /arch
parent196b933d295975ada570dd8cc6e10b420cc83882 (diff)
arch: hexagon: Kconfig: add HAVE_DMA_ATTR in Kconfig and remove "linux/dma-mapping.h" from "asm/dma-mapping.h"
When HAS_DMA, and also need use generic implementation, HAVE_DMA_ATTR must be enabled, or can not pass compiling with allmodconfig, the related error: CC [M] drivers/ata/libata-core.o drivers/ata/libata-core.c: In function 'ata_sg_clean': drivers/ata/libata-core.c:4598:3: error: implicit declaration of function 'dma_unmap_sg' [-Werror=implicit-function-declaration] drivers/ata/libata-core.c: In function 'ata_sg_setup': drivers/ata/libata-core.c:4708:2: error: implicit declaration of function 'dma_map_sg' [-Werror=implicit-function-declaration] "linux/dma-mapping.h" will include "asm/dma-mapping.h", so need remove "linux/dma-mapping.h" from "asm/dma-mapping.h", Signed-off-by: Chen Gang <gang.chen.5i5j@gmail.com> Signed-off-by: Richard Kuo <rkuo@codeaurora.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/hexagon/Kconfig1
-rw-r--r--arch/hexagon/include/asm/dma-mapping.h1
2 files changed, 1 insertions, 1 deletions
diff --git a/arch/hexagon/Kconfig b/arch/hexagon/Kconfig
index 09df2608f40a..fbc5c78c9ac7 100644
--- a/arch/hexagon/Kconfig
+++ b/arch/hexagon/Kconfig
@@ -28,6 +28,7 @@ config HEXAGON
28 select GENERIC_CLOCKEVENTS_BROADCAST 28 select GENERIC_CLOCKEVENTS_BROADCAST
29 select MODULES_USE_ELF_RELA 29 select MODULES_USE_ELF_RELA
30 select GENERIC_CPU_DEVICES 30 select GENERIC_CPU_DEVICES
31 select HAVE_DMA_ATTRS
31 ---help--- 32 ---help---
32 Qualcomm Hexagon is a processor architecture designed for high 33 Qualcomm Hexagon is a processor architecture designed for high
33 performance and low power across a wide variety of applications. 34 performance and low power across a wide variety of applications.
diff --git a/arch/hexagon/include/asm/dma-mapping.h b/arch/hexagon/include/asm/dma-mapping.h
index 85e9935660cb..16965427f6b4 100644
--- a/arch/hexagon/include/asm/dma-mapping.h
+++ b/arch/hexagon/include/asm/dma-mapping.h
@@ -25,7 +25,6 @@
25#include <linux/cache.h> 25#include <linux/cache.h>
26#include <linux/mm.h> 26#include <linux/mm.h>
27#include <linux/scatterlist.h> 27#include <linux/scatterlist.h>
28#include <linux/dma-mapping.h>
29#include <linux/dma-debug.h> 28#include <linux/dma-debug.h>
30#include <linux/dma-attrs.h> 29#include <linux/dma-attrs.h>
31#include <asm/io.h> 30#include <asm/io.h>