]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
drivers: staging: android: ion: Kconfig: Let it also depend on HAS_DMA
authorChen Gang <gang.chen.5i5j@gmail.com>
Mon, 7 Jul 2014 08:49:24 +0000 (16:49 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 8 Jul 2014 22:42:19 +0000 (15:42 -0700)
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>
drivers/staging/android/ion/Kconfig

index 0f8fec1f84e5571c055841b7f96d78432bedca39..0a6e4d03c78a38f4410d4e9c42e5159d825ce623 100644 (file)
@@ -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---