summaryrefslogtreecommitdiffstats
path: root/drivers/staging/android
diff options
context:
space:
mode:
authorChen Gang <gang.chen.5i5j@gmail.com>2014-07-07 16:49:24 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-07-08 15:42:19 -0700
commit403f8af323f0b3b1893ef257be5c5a41cd213d55 (patch)
tree33fd0fcf73ca8d9eb053b8eda5fd38d1211d874c /drivers/staging/android
parent78260ac625e91d2402d72dd2f8c7109f98c1d19a (diff)
downloadop-kernel-dev-403f8af323f0b3b1893ef257be5c5a41cd213d55.zip
op-kernel-dev-403f8af323f0b3b1893ef257be5c5a41cd213d55.tar.gz
drivers: staging: android: ion: Kconfig: Let it also depend on HAS_DMA
ION need HAS_DMA (e.g. need DMA_SHARED_BUFFER), so it has to depend on HAS_DMA, or can not pass compiling with allmodconfig under score which NO_DMA. And the related error: CC drivers/staging/android/ion/ion_cma_heap.o drivers/staging/android/ion/ion_cma_heap.c: In function 'ion_cma_mmap': drivers/staging/android/ion/ion_cma_heap.c:168:2: error: implicit declaration of function 'dma_mmap_coherent' [-Werror=implicit-function-declaration] return dma_mmap_coherent(dev, vma, info->cpu_addr, info->handle, ^ cc1: some warnings being treated as errors make[4]: *** [drivers/staging/android/ion/ion_cma_heap.o] Error 1 make[3]: *** [drivers/staging/android/ion] Error 2 make[2]: *** [drivers/staging/android] Error 2 make[1]: *** [drivers/staging] Error 2 make: *** [drivers] Error 2 Signed-off-by: Chen Gang <gang.chen.5i5j@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/android')
-rw-r--r--drivers/staging/android/ion/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/android/ion/Kconfig b/drivers/staging/android/ion/Kconfig
index 0f8fec1..0a6e4d03 100644
--- a/drivers/staging/android/ion/Kconfig
+++ b/drivers/staging/android/ion/Kconfig
@@ -1,6 +1,6 @@
menuconfig ION
bool "Ion Memory Manager"
- depends on HAVE_MEMBLOCK
+ depends on HAVE_MEMBLOCK && HAS_DMA
select GENERIC_ALLOCATOR
select DMA_SHARED_BUFFER
---help---
OpenPOWER on IntegriCloud