aboutsummaryrefslogtreecommitdiff
path: root/arch/x86/xen/Makefile
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-10-31 00:38:21 +0100
committerIngo Molnar <mingo@elte.hu>2008-10-31 00:38:21 +0100
commite1e302d8a9ab06ba8d7d5ec503d8996e6cf0eca4 (patch)
tree6a6c805fdfd6a2f6433956cbee348b2c3a277784 /arch/x86/xen/Makefile
parent944ac4259e39801c843a915c3da8194ac9af0440 (diff)
parent7f82f000ed030d1108b4de47d9e2d556092980c6 (diff)
Merge branch 'linus' into tracing/ftrace
Diffstat (limited to 'arch/x86/xen/Makefile')
-rw-r--r--arch/x86/xen/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/xen/Makefile b/arch/x86/xen/Makefile
index 313947940a1..6dcefba7836 100644
--- a/arch/x86/xen/Makefile
+++ b/arch/x86/xen/Makefile
@@ -1,4 +1,4 @@
-ifdef CONFIG_FTRACE
+ifdef CONFIG_FUNCTION_TRACER
# Do not profile debug and lowlevel utilities
CFLAGS_REMOVE_spinlock.o = -pg
CFLAGS_REMOVE_time.o = -pg