From: Jon Medhurst <tixy@linaro.org>
Date: Wed, 15 Apr 2015 10:24:40 +0000 (+0100)
Subject: configs: Remove duplicate CONFIG_FUNCTION_TRACER
X-Git-Tag: firefly_0821_release~3680^2~12^2~1
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=d266af7f712dc494727b6a18e26fb123911884d5;p=firefly-linux-kernel-4.4.55.git

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

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