Merge by hand (conflicts between pending drivers and kfree cleanups)

[pandora-kernel.git] / include / asm-um / elf-i386.h

diff --git a/include/asm-um/elf-i386.h b/include/asm-um/elf-i386.h
index b72e235..9bab712 100644 (file)
--- 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