diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-27 14:46:05 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-27 14:46:05 -0700 |
| commit | b3b75cef705708402b5d381a30fa17f89e0549b4 (patch) | |
| tree | aa663da52c34201559560ef9b20049646fd1af0e /arch | |
| parent | f278a2f7bbc2239f479eaf63d0b3ae573b1d746c (diff) | |
| download | linux-3.10-b3b75cef705708402b5d381a30fa17f89e0549b4.tar.gz linux-3.10-b3b75cef705708402b5d381a30fa17f89e0549b4.tar.bz2 linux-3.10-b3b75cef705708402b5d381a30fa17f89e0549b4.zip | |
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>
Diffstat (limited to 'arch')
| -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 ecf4d488333..003ef4c0258 100644 --- a/arch/alpha/kernel/vmlinux.lds.S +++ b/arch/alpha/kernel/vmlinux.lds.S @@ -1,7 +1,6 @@ #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) |