diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-03 11:54:28 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-03 11:54:28 -0400 |
| commit | 6ebfc0e20b409f13e62bbb84ce70102b49945cfd (patch) | |
| tree | 67fea9b9c039ba47f96c7d51d8b2959b35543edf /include/asm-sh/elf.h | |
| parent | 1e9abb5b1dc90cfcf0e6f1e10f7aaf34d0f33b6b (diff) | |
| parent | fac99d97469e7f91102f97101bea620e5f073196 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6:
sh: Fixup __raw_read_trylock().
sh: Kill off remaining config.h references.
sh: Initial gitignore list
sh: build fixes for defconfigs.
sh: Kill off more dead headers.
sh: Set pclk default for SH7705.
sh: defconfig updates.
Diffstat (limited to 'include/asm-sh/elf.h')
| -rw-r--r-- | include/asm-sh/elf.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-sh/elf.h b/include/asm-sh/elf.h index 3a07ab40ac4d..fc050fd7645e 100644 --- a/include/asm-sh/elf.h +++ b/include/asm-sh/elf.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef __ASM_SH_ELF_H | 1 | #ifndef __ASM_SH_ELF_H |
| 2 | #define __ASM_SH_ELF_H | 2 | #define __ASM_SH_ELF_H |
| 3 | 3 | ||
| 4 | #include <asm/processor.h> | ||
| 5 | #include <asm/auxvec.h> | 4 | #include <asm/auxvec.h> |
| 6 | #include <asm/ptrace.h> | 5 | #include <asm/ptrace.h> |
| 7 | #include <asm/user.h> | 6 | #include <asm/user.h> |