aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-05-30 18:26:54 +0100
committerMark Brown <broonie@linaro.org>2014-05-30 18:26:54 +0100
commit8965179ffd7ee5507de9c3aed331cddaa56ecdc1 (patch)
tree1401ea70914d9b9ddf788e23a009721b97d24336
parent25210066633a868e52dc23f680111b23b974eba3 (diff)
parent226456efe08af5be310223c52329d3b81d2e851d (diff)
Merge remote-tracking branch 'lsk/v3.10/topic/configs' into linux-linaro-lsklsk-14.05.1
-rw-r--r--linaro/configs/linaro-base.conf5
1 files changed, 5 insertions, 0 deletions
diff --git a/linaro/configs/linaro-base.conf b/linaro/configs/linaro-base.conf
index 4ec01a909d49..4d2ac0209671 100644
--- a/linaro/configs/linaro-base.conf
+++ b/linaro/configs/linaro-base.conf
@@ -97,3 +97,8 @@ CONFIG_STRICT_DEVMEM=y
CONFIG_KGDB=y
CONFIG_KGDB_TESTS=y
CONFIG_OF_IDLE_STATES=y
+CONFIG_FTRACE=y
+CONFIG_FUNCTION_TRACER=y
+CONFIG_FTRACE_SYSCALLS=y
+CONFIG_STACK_TRACER=y
+CONFIG_FUNCTION_PROFILER=y