Merge remote-tracking branch 'lsk/v3.10/topic/arm64-misc' into linux-linaro-lsk

[firefly-linux-kernel-4.4.55.git] / linaro / configs / android.conf

diff --git a/linaro/configs/android.conf b/linaro/configs/android.conf
index 538adefff80f44a2a24fcf60acbc497495d2ba16..e4fd1ad190285311acb1464fbe1539916f0a1e0b 100644 (file)
--- a/linaro/configs/android.conf
+++ b/linaro/configs/android.conf
@@ -30,3 +30,13 @@ 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_ION_DUMMY=y
+CONFIG_ADF=y
+CONFIG_ADF_FBDEV=y
+CONFIG_ADF_MEMBLOCK=y
+CONFIG_DMA_SHARED_BUFFER=y
+CONFIG_TUN=y