aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-05-30 18:27:01 +0100
committerMark Brown <broonie@linaro.org>2014-05-30 18:27:01 +0100
commitdf704e9b1dfe9054ef6815bccd2ea517aaf242d0 (patch)
tree8a39b1f16faf4581ced55250fa3ba651976e456f
parent9e2da0c5c819d6336b957c9b538f36f9b15092b4 (diff)
parent8965179ffd7ee5507de9c3aed331cddaa56ecdc1 (diff)
downloadlinux-linaro-stable-df704e9b1dfe9054ef6815bccd2ea517aaf242d0.tar.gz
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-androidlsk-android-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