diff options
author | <jgarzik@pretzel.yyz.us> | 2005-06-03 23:54:56 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-03 23:54:56 -0400 |
commit | 73561695b2e77473e353a5ae63bab81ed5098d8e (patch) | |
tree | d039affaa54d38985e41566e4d62e0aa6a170287 /include/asm-um/elf-i386.h | |
parent | 6f2f38128170814e151cfedf79532e19cd179567 (diff) | |
parent | 8be3de3fd8469154a2b3e18a4712032dac5b4a53 (diff) | |
download | op-kernel-dev-73561695b2e77473e353a5ae63bab81ed5098d8e.zip op-kernel-dev-73561695b2e77473e353a5ae63bab81ed5098d8e.tar.gz |
Automatic merge of /spare/repo/linux-2.6/.git branch HEAD
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 b72e235..9bab712 100644 --- a/include/asm-um/elf-i386.h +++ b/include/asm-um/elf-i386.h @@ -5,7 +5,7 @@ #ifndef __UM_ELF_I386_H #define __UM_ELF_I386_H -#include "user.h" +#include <asm/user.h> #define R_386_NONE 0 #define R_386_32 1 |