aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-01-14 20:24:04 +0000
committerMark Brown <broonie@linaro.org>2014-01-14 20:24:04 +0000
commitbc2c004f6014f00de48edddb5062b37094760962 (patch)
tree52d8e01bb81b8070ddb02de7de50789887ac7ba6
parent98eba195f9f6efff2259f17e2261209e47529ab1 (diff)
parent530dd64bb2fa7bb9e2b3b3b5620a11a59c24d103 (diff)
Merge remote-tracking branch 'lsk/v3.10/topic/configs' into linux-linaro-lsk
-rw-r--r--linaro/configs/android.conf8
1 files changed, 8 insertions, 0 deletions
diff --git a/linaro/configs/android.conf b/linaro/configs/android.conf
index 538adefff80..0062c611f79 100644
--- a/linaro/configs/android.conf
+++ b/linaro/configs/android.conf
@@ -30,3 +30,11 @@ CONFIG_FUSE_FS=y
CONFIG_CPU_FREQ_GOV_INTERACTIVE=y
CONFIG_CPU_FREQ_DEFAULT_GOV_INTERACTIVE=y
CONFIG_ION=y
+CONFIG_SYNC=y
+CONFIG_SW_SYNC=y
+CONFIG_SW_SYNC_USER=y
+CONFIG_ION_TEST=y
+CONFIG_ADF=y
+CONFIG_ADF_FBDEV=y
+CONFIG_ADF_MEMBLOCK=y
+CONFIG_DMA_SHARED_BUFFER=y