Merge commit 'v2.6.28-rc2' into tracing/urgent

[pandora-kernel.git] / Makefile

diff --git a/Makefile b/Makefile
index e9c5d47..a7f2068 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -536,7 +536,7 @@ KBUILD_CFLAGS       += -g
 KBUILD_AFLAGS  += -gdwarf-2
 endif
 
-ifdef CONFIG_FTRACE
+ifdef CONFIG_FUNCTION_TRACER
 KBUILD_CFLAGS  += -pg
 endif