aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-02-12 20:42:20 +0000
committerMark Brown <broonie@linaro.org>2014-02-12 20:42:20 +0000
commitccf1801b089f5575144c4346e4d7d3883a6c9163 (patch)
tree3163ed5e7c0845151d670328e0b76630bc7d4883
parent4ed15484d2b90c28ecb0eb4ed0330049343c60ad (diff)
parent0c82fcb7b2e4724efa36b1cf6ef8b3d31bd79aec (diff)
downloadlinaro-lsk-ccf1801b089f5575144c4346e4d7d3883a6c9163.tar.gz
Merge remote-tracking branch 'lsk/v3.10/topic/configs' into linux-linaro-lsk-android
-rw-r--r--linaro/configs/android.conf1
1 files changed, 1 insertions, 0 deletions
diff --git a/linaro/configs/android.conf b/linaro/configs/android.conf
index 0062c611f79..e1bf601fc57 100644
--- a/linaro/configs/android.conf
+++ b/linaro/configs/android.conf
@@ -34,6 +34,7 @@ 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