Merge branch 'for-2.6.25' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus...

[linux-2.6-block.git] / include / linux / elf.h

diff --git a/include/linux/elf.h b/include/linux/elf.h
index 30eb6fbd5323851523a0c2d8033424b86f93eedf..bad1b16ec49a73f432ed27a0c97131205f726c29 100644 (file)
--- a/include/linux/elf.h
+++ b/include/linux/elf.h
@@ -3,7 +3,9 @@
 
 #include <linux/types.h>
 #include <linux/elf-em.h>
+#ifdef __KERNEL__
 #include <asm/elf.h>
+#endif
 
 struct file;