summaryrefslogtreecommitdiff
path: root/arch/alpha
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-09-26 10:51:54 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-09-26 10:51:54 -0700
commit0d9df2515dbceb67d343c0f10fd3ff218380d524 (patch)
tree9b0f96173e1f63eacb72d7a527177771e6ff46a1 /arch/alpha
parentcce1d9f23213f3a8a43b6038df84a665aa8d8612 (diff)
parentde078ef55c74d02ee93d44513da5ee88a089d71d (diff)
downloadlinux-3.10-0d9df2515dbceb67d343c0f10fd3ff218380d524.tar.gz
linux-3.10-0d9df2515dbceb67d343c0f10fd3ff218380d524.tar.bz2
linux-3.10-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/alpha')
-rw-r--r--arch/alpha/kernel/vmlinux.lds.S1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/alpha/kernel/vmlinux.lds.S b/arch/alpha/kernel/vmlinux.lds.S
index 2906665b1c1..ecf4d488333 100644
--- a/arch/alpha/kernel/vmlinux.lds.S
+++ b/arch/alpha/kernel/vmlinux.lds.S
@@ -1,4 +1,5 @@
#include <asm-generic/vmlinux.lds.h>
+#include <asm/thread_info.h>
#include <asm/page.h>
#include <asm/thread_info.h>