lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branches 'sh/compressors' and 'sh/ftrace'

Browse Source
This commit is contained in:
Paul Mundt
2009-07-12 11:45:25 -04:00
parent 040f43e0bf e460ab27b6
commit 3e28ad7b24
7 changed files with 60 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/sh/boot/compressed/Makefile
View File

@@ -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