diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-07-12 11:45:25 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-07-12 11:45:25 -0400 |
| commit | 3e28ad7b2442e02c35c2fee2d85a90d0202a9aad (patch) | |
| tree | e862c99ab02b7d899c99b9b6b736fbbb63ec1e73 /arch/sh/boot | |
| parent | 040f43e0bf70935cbe8a775110206d11367e11db (diff) | |
| parent | e460ab27b6c3ea313762169713086529d5bfb8bc (diff) | |
Merge branches 'sh/compressors' and 'sh/ftrace'
Diffstat (limited to 'arch/sh/boot')
| -rw-r--r-- | arch/sh/boot/compressed/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/boot/compressed/Makefile b/arch/sh/boot/compressed/Makefile index 3324019e207e..59e2937caa2f 100644 --- a/arch/sh/boot/compressed/Makefile +++ b/arch/sh/boot/compressed/Makefile | |||
| @@ -24,7 +24,7 @@ IMAGE_OFFSET := $(shell /bin/bash -c 'printf "0x%08x" \ | |||
| 24 | 24 | ||
| 25 | LIBGCC := $(shell $(CC) $(KBUILD_CFLAGS) -print-libgcc-file-name) | 25 | LIBGCC := $(shell $(CC) $(KBUILD_CFLAGS) -print-libgcc-file-name) |
| 26 | 26 | ||
| 27 | ifeq ($(CONFIG_FUNCTION_TRACER),y) | 27 | ifeq ($(CONFIG_MCOUNT),y) |
| 28 | ORIG_CFLAGS := $(KBUILD_CFLAGS) | 28 | ORIG_CFLAGS := $(KBUILD_CFLAGS) |
| 29 | KBUILD_CFLAGS = $(subst -pg, , $(ORIG_CFLAGS)) | 29 | KBUILD_CFLAGS = $(subst -pg, , $(ORIG_CFLAGS)) |
| 30 | endif | 30 | endif |