summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2008-10-28 11:56:17 +1100
committerStephen Rothwell <sfr@canb.auug.org.au>2008-10-28 11:56:17 +1100
commit0767d9352f614e7aeca6e36a3f48cc486b9c75ef (patch)
tree03290a73f195c7a9dc7173728e04c06da5e1e447 /lib
parentaaa18b7cad137fde5a1e8c0bdb5417dfe92e555e (diff)
parent031ac775a456ae11cef51b63aca575e653fd5c4f (diff)
Merge commit 'ftrace/auto-ftrace-next'
Diffstat (limited to 'lib')
-rw-r--r--lib/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/Makefile b/lib/Makefile
index 16feaab057b2..7cb65d85aeb0 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -2,7 +2,7 @@
# Makefile for some libs needed in the kernel.
#
-ifdef CONFIG_FTRACE
+ifdef CONFIG_FUNCTION_TRACER
ORIG_CFLAGS := $(KBUILD_CFLAGS)
KBUILD_CFLAGS = $(subst -pg,,$(ORIG_CFLAGS))
endif