summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorAl Viro <viro@parcelfarce.linux.theplanet.co.uk>2005-08-18 11:24:23 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-08-18 12:53:58 -0700
commit718d8989bca49761daf65f77249b0067c40756b2 (patch)
treebc48f8c3596d8d7e8ca04102c23bd01096669a7e /arch
parent024f474795af7a0d41bd6d60061d78bd66d13f56 (diff)
downloadlinux-3.10-718d8989bca49761daf65f77249b0067c40756b2.tar.gz
linux-3.10-718d8989bca49761daf65f77249b0067c40756b2.tar.bz2
linux-3.10-718d8989bca49761daf65f77249b0067c40756b2.zip
[PATCH] uml: fix the x86_64 build
asm/elf.h breaks the x86_64 build. Signed-off-by: Jeff Dike <jdike@addtoit.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/um/os-Linux/elf_aux.c1
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"