diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-06-02 11:39:11 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-06-02 11:39:11 -0400 |
| commit | 1c3f45ab2f7f879ea482501c83899505c31f7539 (patch) | |
| tree | 672465b3b9b3e2e26a8caf74ed64aa6885c52c13 /include/asm-um/elf-i386.h | |
| parent | 4bcff1b37e7c3aed914d1ce5b45994adc7dbf455 (diff) | |
| parent | e0d6d71440a3a35c6fc2dde09f8e8d4d7bd44dda (diff) | |
Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'include/asm-um/elf-i386.h')
| -rw-r--r-- | include/asm-um/elf-i386.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-um/elf-i386.h b/include/asm-um/elf-i386.h index b72e23519e00..9bab712dc5c0 100644 --- a/include/asm-um/elf-i386.h +++ b/include/asm-um/elf-i386.h | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | #ifndef __UM_ELF_I386_H | 5 | #ifndef __UM_ELF_I386_H |
| 6 | #define __UM_ELF_I386_H | 6 | #define __UM_ELF_I386_H |
| 7 | 7 | ||
| 8 | #include "user.h" | 8 | #include <asm/user.h> |
| 9 | 9 | ||
| 10 | #define R_386_NONE 0 | 10 | #define R_386_NONE 0 |
| 11 | #define R_386_32 1 | 11 | #define R_386_32 1 |