diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2008-11-03 20:46:44 +0000 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2008-11-03 20:46:44 +0000 |
| commit | 973a971d5a5ef0d6a60e5c9b0df675fef6be3383 (patch) | |
| tree | d49729a4bff6fd5bdacfcc57e7ba44911fd8812c /arch/sh/boot | |
| parent | f4bafd5dc0d4f03f6dc4466d233a4601c54d40b3 (diff) | |
| parent | a75952b72a0fff3031124003e62118111aed42c1 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into rmk-next
Diffstat (limited to 'arch/sh/boot')
| -rw-r--r-- | arch/sh/boot/compressed/Makefile_32 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/boot/compressed/Makefile_32 b/arch/sh/boot/compressed/Makefile_32 index 301e6d50325..b96a055b053 100644 --- a/arch/sh/boot/compressed/Makefile_32 +++ b/arch/sh/boot/compressed/Makefile_32 @@ -23,7 +23,7 @@ IMAGE_OFFSET := $(shell /bin/bash -c 'printf "0x%08x" \ LIBGCC := $(shell $(CC) $(KBUILD_CFLAGS) -print-libgcc-file-name) -ifeq ($(CONFIG_FTRACE),y) +ifeq ($(CONFIG_FUNCTION_TRACER),y) ORIG_CFLAGS := $(KBUILD_CFLAGS) KBUILD_CFLAGS = $(subst -pg, , $(ORIG_CFLAGS)) endif |