Merge remote-tracking branch 'staging/staging-next'

[deliverable/linux.git] / drivers / staging / android / ion / Kconfig

diff --git a/drivers/staging/android/ion/Kconfig b/drivers/staging/android/ion/Kconfig
index 19c1572f1525ef5c506f1505dbe48ecb04b819cd..8a54ddc6d51353efcf71c1f35b8e1e34d5238ba9 100644 (file)
--- a/drivers/staging/android/ion/Kconfig
+++ b/drivers/staging/android/ion/Kconfig
@@ -40,3 +40,14 @@ config ION_HISI
          Choose this option if you wish to use ion on Hisilicon Platform.
 
 source "drivers/staging/android/ion/hisilicon/Kconfig"
+
+config ION_OF
+       bool "Devicetree support for Ion"
+       depends on ION && OF
+       help
+         Provides base support for defining Ion heaps in devicetree
+         and setting them up. Also includes functions for platforms
+         to parse the devicetree and expand for their own custom
+         extensions
+
+         If using Ion and devicetree, you should say Y here