summaryrefslogtreecommitdiffstats
path: root/drivers/staging/android/ion/Kconfig
diff options
context:
space:
mode:
authorJohn Stultz <john.stultz@linaro.org>2013-12-16 21:07:51 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-12-17 08:57:21 -0800
commit679bcc935c4ed45e3f9c56f5d0c766b0844c93a9 (patch)
tree1dd25c4bbc0672ffc1001319b3089f48bb04af9e /drivers/staging/android/ion/Kconfig
parent1be544cdb92954e7d73ce09f0681d9f8b6f5c3c6 (diff)
staging: ion: Add HAVE_MEMBLOCK config dependency
The kbuild test robot reported a build issue w/ ION on m68k: drivers/staging/android/ion/ion.c: In function 'ion_reserve': drivers/staging/android/ion/ion.c:1526:4: error: implicit declaration of function 'memblock_alloc_base' [-Werror=implicit-function-declaration] drivers/staging/android/ion/ion.c:1528:11: error: 'MEMBLOCK_ALLOC_ANYWHERE' undeclared (first use in this function) drivers/staging/android/ion/ion.c:1528:11: note: each undeclared identifier is reported only once for each function it appears in drivers/staging/android/ion/ion.c:1537:4: error: implicit declaration of function 'memblock_reserve' [-Werror=implicit-function-declaration] cc1: some warnings being treated as errors This is caused by ION using memblock functionality which m68k doesn't support. This patch adds a HAVE_MEMBLOCK dependency to the ION config. Acked-by: Colin Cross <ccross@android.com> Cc: Android Kernel Team <kernel-team@android.com> Reported-by: kbuild test robot <fengguang.wu@intel.com> Signed-off-by: John Stultz <john.stultz@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/android/ion/Kconfig')
-rw-r--r--drivers/staging/android/ion/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/staging/android/ion/Kconfig b/drivers/staging/android/ion/Kconfig
index b95281eef2aa..a9a64ea2343f 100644
--- a/drivers/staging/android/ion/Kconfig
+++ b/drivers/staging/android/ion/Kconfig
@@ -1,5 +1,6 @@
menuconfig ION
bool "Ion Memory Manager"
+ depends on HAVE_MEMBLOCK
select GENERIC_ALLOCATOR
select DMA_SHARED_BUFFER
---help---