]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 26 Sep 2009 17:51:54 +0000 (10:51 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 26 Sep 2009 17:51:54 +0000 (10:51 -0700)
* 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

1  2 
arch/alpha/kernel/vmlinux.lds.S

index 2906665b1c103199f1c660d34cc5b2027fb63243,55c3b23612a80fcb964089111a298c5e27374832..ecf4d488333d1c19369de7c1cdfabb91dd36ded0
@@@ -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)