diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-26 13:51:54 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-26 13:51:54 -0400 |
| commit | 0d9df2515dbceb67d343c0f10fd3ff218380d524 (patch) | |
| tree | 9b0f96173e1f63eacb72d7a527177771e6ff46a1 /arch/alpha | |
| parent | cce1d9f23213f3a8a43b6038df84a665aa8d8612 (diff) | |
| parent | de078ef55c74d02ee93d44513da5ee88a089d71d (diff) | |
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.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/alpha/kernel/vmlinux.lds.S b/arch/alpha/kernel/vmlinux.lds.S index 2906665b1c10..ecf4d488333d 100644 --- a/arch/alpha/kernel/vmlinux.lds.S +++ b/arch/alpha/kernel/vmlinux.lds.S | |||
| @@ -1,4 +1,5 @@ | |||
| 1 | #include <asm-generic/vmlinux.lds.h> | 1 | #include <asm-generic/vmlinux.lds.h> |
| 2 | #include <asm/thread_info.h> | ||
| 2 | #include <asm/page.h> | 3 | #include <asm/page.h> |
| 3 | #include <asm/thread_info.h> | 4 | #include <asm/thread_info.h> |
| 4 | 5 | ||