Merge branch 'v3.10/topic/configs' into linux-linaro-lsk-v3.10

* v3.10/topic/configs:
  configs: linaro-base: enable ZRAM features
  configs: Enable coresight by default

diff --git a/linaro/configs/linaro-base.conf b/linaro/configs/linaro-base.conf
index c2a5143518fbbd2b7edf553524d2f53024ac3290..c86f432f818a5b8ae249c6dc57d29e2bcef1c17e 100644 (file)
--- a/linaro/configs/linaro-base.conf
+++ b/linaro/configs/linaro-base.conf
@@ -117,3 +117,13 @@ CONFIG_DEBUG_INFO=y
 CONFIG_FANOTIFY=y
 CONFIG_RCU_TORTURE_TEST=m
 CONFIG_RCU_TORTURE_TEST_RUNNABLE=n
+CONFIG_CORESIGHT=y
+CONFIG_CORESIGHT_LINKS_AND_SINKS=y
+CONFIG_CORESIGHT_SOURCE_ETM=y
+
+# enable ZRAM features
+CONFIG_ZPOOL=y
+CONFIG_ZSMALLOC=y
+CONFIG_ZRAM=y
+CONFIG_ZRAM_LZ4_COMPRESS=y
+