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 15f6ea784f63b9439366d6d602efecfbefb9696e..c2a5143518fbbd2b7edf553524d2f53024ac3290 100644 (file)
--- 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