aboutsummaryrefslogtreecommitdiff
path: root/drivers/staging/android/ion/Kconfig
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-12-13 18:50:12 +0000
committerMark Brown <broonie@linaro.org>2013-12-13 18:50:12 +0000
commit679160a872dfe88bf34e50f1939e190ba59e534e (patch)
treefe342d02e224d006a23745a657148ce62b54fee4 /drivers/staging/android/ion/Kconfig
parenteed4bafd63b5584adb832a582a931ecba41dec55 (diff)
parent8f1c42284159ebd6851e1e75507f2ad6fba87d0f (diff)
Merge branch 'android-3.10' of https://android.googlesource.com/kernel/common into lsk-v3.10-aospv3.10/topic/aosp
Diffstat (limited to 'drivers/staging/android/ion/Kconfig')
-rw-r--r--drivers/staging/android/ion/Kconfig14
1 files changed, 12 insertions, 2 deletions
diff --git a/drivers/staging/android/ion/Kconfig b/drivers/staging/android/ion/Kconfig
index c62f2cbb9e8..a342d96ee4f 100644
--- a/drivers/staging/android/ion/Kconfig
+++ b/drivers/staging/android/ion/Kconfig
@@ -1,10 +1,20 @@
menuconfig ION
tristate "Ion Memory Manager"
- depends on ARM
select GENERIC_ALLOCATOR
select DMA_SHARED_BUFFER
+ ---help---
+ Chose this option to enable the ION Memory Manager,
+ used by Android to efficiently allocate buffers
+ from userspace that can be shared between drivers.
+ If you're not using Android its probably safe to
+ say N here.
+
+config ION_TEST
+ tristate "Ion Test Device"
+ depends on ION
help
- Chose this option to enable the ION Memory Manager.
+ Choose this option to create a device that can be used to test the
+ kernel and device side ION functions.
config ION_TEGRA
tristate "Ion for Tegra"