From b4ef43d5de3b44a2d98198d5d9b66d9fc97b2924 Mon Sep 17 00:00:00 2001 From: Jon Medhurst Date: Thu, 9 Apr 2015 11:30:36 +0100 Subject: [PATCH] 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 --- linaro/configs/linaro-base.conf | 1 - 1 file changed, 1 deletion(-) 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 -- 2.34.1