diff options
author | Steve French <sfrench@us.ibm.com> | 2005-08-20 21:40:00 -0700 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2005-08-20 21:40:00 -0700 |
commit | 646352319b6cd369750a706706810d87f6b6efa7 (patch) | |
tree | e7830e1276cbad7d29bf9471def4b8940592c3b7 /arch/um/os-Linux/elf_aux.c | |
parent | d3485d37c0b3292aec0618b6663c57542df5da99 (diff) | |
parent | f6fdd7d9c273bb2a20ab467cb57067494f932fa3 (diff) |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'arch/um/os-Linux/elf_aux.c')
-rw-r--r-- | arch/um/os-Linux/elf_aux.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/um/os-Linux/elf_aux.c b/arch/um/os-Linux/elf_aux.c index 9416e1c2992..4cca3e9c23f 100644 --- a/arch/um/os-Linux/elf_aux.c +++ b/arch/um/os-Linux/elf_aux.c @@ -9,7 +9,6 @@ */ #include <elf.h> #include <stddef.h> -#include <asm/elf.h> #include "init.h" #include "elf_user.h" #include "mem_user.h" |