From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 26 Sep 2009 17:51:54 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=0d9df2515dbceb67d343c0f10fd3ff218380d524;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

Merge git://git./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
---

0d9df2515dbceb67d343c0f10fd3ff218380d524
diff --cc arch/alpha/kernel/vmlinux.lds.S
index 2906665b1c10,55c3b23612a8..ecf4d488333d
--- a/arch/alpha/kernel/vmlinux.lds.S
+++ b/arch/alpha/kernel/vmlinux.lds.S
@@@ -1,6 -1,6 +1,7 @@@
  #include <asm-generic/vmlinux.lds.h>
+ #include <asm/thread_info.h>
  #include <asm/page.h>
 +#include <asm/thread_info.h>
  
  OUTPUT_FORMAT("elf64-alpha")
  OUTPUT_ARCH(alpha)