diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-19 06:42:13 +0200 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-19 06:42:13 +0200 |
| commit | 4a3381feb823e06c8e2da7e283c17b0b6fdbddcf (patch) | |
| tree | e1bef4c3db854bb10fd13dc67415d77b5d999533 /include/asm-arm/elf.h | |
| parent | [PATCH] libata: fix non-uniform ports handling (diff) | |
| parent | x86: save/restore eflags in context switch (diff) | |
| download | linux-4a3381feb823e06c8e2da7e283c17b0b6fdbddcf.tar.xz linux-4a3381feb823e06c8e2da7e283c17b0b6fdbddcf.zip | |
Merge branch 'master' into upstream
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 @@ #include <asm/ptrace.h> #include <asm/user.h> +#ifdef __KERNEL #include <asm/procinfo.h> +#endif typedef unsigned long elf_greg_t; typedef unsigned long elf_freg_t[3]; |