aboutsummaryrefslogtreecommitdiff
path: root/linaro
diff options
context:
space:
mode:
authorJon Medhurst <tixy@linaro.org>2015-04-15 11:24:40 +0100
committerAlex Shi <alex.shi@linaro.org>2015-04-15 20:03:08 +0800
commitd266af7f712dc494727b6a18e26fb123911884d5 (patch)
tree5d138966dc824739d6579f95611c4e1be9f53dd7 /linaro
parentef684a4f49f387885ee22ae93ff6b3e1fa2b41b2 (diff)
configs: Remove duplicate CONFIG_FUNCTION_TRACER
To avoid the following warning when running merge_config.sh with this config fragment... ./.tmp.config.37TtCkZvtp:92:warning: override: reassigning to symbol FUNCTION_TRACER Signed-off-by: Jon Medhurst <tixy@linaro.org>
Diffstat (limited to 'linaro')
-rw-r--r--linaro/configs/linaro-base.conf1
1 files changed, 0 insertions, 1 deletions
diff --git a/linaro/configs/linaro-base.conf b/linaro/configs/linaro-base.conf
index 15f6ea784f63..c2a5143518fb 100644
--- a/linaro/configs/linaro-base.conf
+++ b/linaro/configs/linaro-base.conf
@@ -98,7 +98,6 @@ 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