diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-26 19:51:54 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-26 19:51:54 +0200 |
commit | 0d9df2515dbceb67d343c0f10fd3ff218380d524 (patch) | |
tree | 9b0f96173e1f63eacb72d7a527177771e6ff46a1 /arch/mips/kernel/Makefile | |
parent | Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-leds (diff) | |
parent | alpha: fix build after vmlinux.lds.S cleanup (diff) | |
download | linux-0d9df2515dbceb67d343c0f10fd3ff218380d524.tar.xz linux-0d9df2515dbceb67d343c0f10fd3ff218380d524.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes
* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes:
alpha: fix build after vmlinux.lds.S cleanup
mips: fix build of vmlinux.lds
Diffstat (limited to 'arch/mips/kernel/Makefile')
-rw-r--r-- | arch/mips/kernel/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/mips/kernel/Makefile b/arch/mips/kernel/Makefile index e96122159928..eecd2a9f155c 100644 --- a/arch/mips/kernel/Makefile +++ b/arch/mips/kernel/Makefile @@ -2,6 +2,8 @@ # Makefile for the Linux/MIPS kernel. # +CPPFLAGS_vmlinux.lds := $(KBUILD_CFLAGS) + extra-y := head.o init_task.o vmlinux.lds obj-y += cpu-probe.o branch.o entry.o genex.o irq.o process.o \ |