[LSK PATCH 6/6] configs: Remove duplicate CONFIG_FUNCTION_TRACER

to avoid warning when running merge_config.sh

Signed-off-by: Jon Medhurst tixy@linaro.org --- 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 15f6ea7..c2a5143 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