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
This commit is contained in:
Kevin Hilman 2015-06-02 08:47:21 -07:00
commit 3c81a38506

View File

@ -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