diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2008-10-31 03:18:02 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2008-10-31 03:18:02 -0400 |
| commit | 0803d540db06f53acd2fabf1347d5b665218f14a (patch) | |
| tree | f5f8e5510a76bb59d3583478961daf5afc32df08 /lib/Makefile | |
| parent | a8884e3415c29c58a5875d54c109c4a7fcaa6fb4 (diff) | |
| parent | 721d5dfe7e516954c501d5e9d0dfab379cf4241a (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'lib/Makefile')
| -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 |