diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-27 17:46:05 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-27 17:46:05 -0400 |
| commit | b3b75cef705708402b5d381a30fa17f89e0549b4 (patch) | |
| tree | aa663da52c34201559560ef9b20049646fd1af0e | |
| parent | f278a2f7bbc2239f479eaf63d0b3ae573b1d746c (diff) | |
alpha: Fix duplicate <asm/thread_info.h> include
.. duplicated by merging the same fix twice, for details see commit
0d9df2515dbceb67d343c0f10fd3ff218380d524 ("Merge
git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes")
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | arch/alpha/kernel/vmlinux.lds.S | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/alpha/kernel/vmlinux.lds.S b/arch/alpha/kernel/vmlinux.lds.S index ecf4d488333d..003ef4c02585 100644 --- a/arch/alpha/kernel/vmlinux.lds.S +++ b/arch/alpha/kernel/vmlinux.lds.S | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #include <asm-generic/vmlinux.lds.h> | 1 | #include <asm-generic/vmlinux.lds.h> |
| 2 | #include <asm/thread_info.h> | 2 | #include <asm/thread_info.h> |
| 3 | #include <asm/page.h> | 3 | #include <asm/page.h> |
| 4 | #include <asm/thread_info.h> | ||
| 5 | 4 | ||
| 6 | OUTPUT_FORMAT("elf64-alpha") | 5 | OUTPUT_FORMAT("elf64-alpha") |
| 7 | OUTPUT_ARCH(alpha) | 6 | OUTPUT_ARCH(alpha) |