diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-21 10:18:14 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-21 10:18:14 -0400 |
| commit | 91fa47964165a42401fbc1f41caa63ab78564305 (patch) | |
| tree | 8f4ffdcbdedd845563630c3bcacd9407c75ccb52 /include/asm-arm/elf.h | |
| parent | 56965536b8056f57830219efbba4b85218d96d6c (diff) | |
| parent | e478bec0ba0a83a48a0f6982934b6de079e7e6b3 (diff) | |
Merge branch 'master' into gfs2
Diffstat (limited to 'include/asm-arm/elf.h')
| -rw-r--r-- | include/asm-arm/elf.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-arm/elf.h b/include/asm-arm/elf.h index 71061ca5c5d0..ae7baa6c73f7 100644 --- a/include/asm-arm/elf.h +++ b/include/asm-arm/elf.h | |||
| @@ -8,7 +8,9 @@ | |||
| 8 | 8 | ||
| 9 | #include <asm/ptrace.h> | 9 | #include <asm/ptrace.h> |
| 10 | #include <asm/user.h> | 10 | #include <asm/user.h> |
| 11 | #ifdef __KERNEL | ||
| 11 | #include <asm/procinfo.h> | 12 | #include <asm/procinfo.h> |
| 13 | #endif | ||
| 12 | 14 | ||
| 13 | typedef unsigned long elf_greg_t; | 15 | typedef unsigned long elf_greg_t; |
| 14 | typedef unsigned long elf_freg_t[3]; | 16 | typedef unsigned long elf_freg_t[3]; |