diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-22 03:08:14 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-22 03:08:14 -0400 |
| commit | debfcaf93ed500a051489db6646d71f29fe86a68 (patch) | |
| tree | 7ba189b6dd654022ecc655b68e3c0a4573627706 /lib | |
| parent | 2515ddc6db8eb49a79f0fe5e67ff09ac7c81eab4 (diff) | |
| parent | 81520a1b0649d0701205b818714a8c1e1cfbbb5b (diff) | |
Merge branch 'tracing/ftrace' into tracing/urgent
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Makefile | 2 |
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 @@ | |||
| 2 | # Makefile for some libs needed in the kernel. | 2 | # Makefile for some libs needed in the kernel. |
| 3 | # | 3 | # |
| 4 | 4 | ||
| 5 | ifdef CONFIG_FTRACE | 5 | ifdef CONFIG_FUNCTION_TRACER |
| 6 | ORIG_CFLAGS := $(KBUILD_CFLAGS) | 6 | ORIG_CFLAGS := $(KBUILD_CFLAGS) |
| 7 | KBUILD_CFLAGS = $(subst -pg,,$(ORIG_CFLAGS)) | 7 | KBUILD_CFLAGS = $(subst -pg,,$(ORIG_CFLAGS)) |
| 8 | endif | 8 | endif |