summaryrefslogtreecommitdiffstats
path: root/arch/sh/boot
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2009-07-12 17:45:25 +0200
committerPaul Mundt <lethal@linux-sh.org>2009-07-12 17:45:25 +0200
commit3e28ad7b2442e02c35c2fee2d85a90d0202a9aad (patch)
treee862c99ab02b7d899c99b9b6b736fbbb63ec1e73 /arch/sh/boot
parentsh64: Don't use PHYSADDR() for output_addr calculation. (diff)
parentsh: Fix up stack overflow check with ftrace disabled. (diff)
downloadlinux-3e28ad7b2442e02c35c2fee2d85a90d0202a9aad.tar.xz
linux-3e28ad7b2442e02c35c2fee2d85a90d0202a9aad.zip
Merge branches 'sh/compressors' and 'sh/ftrace'
Diffstat (limited to 'arch/sh/boot')
-rw-r--r--arch/sh/boot/compressed/Makefile2
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" \
LIBGCC := $(shell $(CC) $(KBUILD_CFLAGS) -print-libgcc-file-name)
-ifeq ($(CONFIG_FUNCTION_TRACER),y)
+ifeq ($(CONFIG_MCOUNT),y)
ORIG_CFLAGS := $(KBUILD_CFLAGS)
KBUILD_CFLAGS = $(subst -pg, , $(ORIG_CFLAGS))
endif