diff options
author | Takashi Iwai <tiwai@suse.de> | 2016-05-10 16:06:04 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2016-05-10 16:06:04 +0200 |
commit | 2e00fde5c6ed8535244332ebb55e881baa54ae46 (patch) | |
tree | f578e02ef1dc6e59630f09404bb2f58500876811 /arch/parisc/Makefile | |
parent | ALSA: hda - Clarify CONFIG_SND_HDA_RECONFIG usages (diff) | |
parent | ALSA: hda - Fix subwoofer pin on ASUS N751 and N551 (diff) | |
download | linux-dev-2e00fde5c6ed8535244332ebb55e881baa54ae46.tar.xz linux-dev-2e00fde5c6ed8535244332ebb55e881baa54ae46.zip |
Merge branch 'for-linus' into for-next
Diffstat (limited to 'arch/parisc/Makefile')
-rw-r--r-- | arch/parisc/Makefile | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/parisc/Makefile b/arch/parisc/Makefile index 965a0999fc4c..75cb451b1f03 100644 --- a/arch/parisc/Makefile +++ b/arch/parisc/Makefile @@ -62,9 +62,7 @@ cflags-y += -mdisable-fpregs # Without this, "ld -r" results in .text sections that are too big # (> 0x40000) for branches to reach stubs. -ifndef CONFIG_FUNCTION_TRACER - cflags-y += -ffunction-sections -endif +cflags-y += -ffunction-sections # Use long jumps instead of long branches (needed if your linker fails to # link a too big vmlinux executable). Not enabled for building modules. |