X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=include%2Fasm-x86%2Fuser.h;h=999873b22e7f4fd9e3531d8a19a47d2e716f96b8;hb=b2bc27314664c4d1a2f02e6f4cd0c32e4681d61e;hp=484715abe74a66657ffb66fa606b973bb730b103;hpb=ebf8889bd1fe3615991ff4494635d237280652a2;p=linux-2.6-omap-h63xx.git

diff --git a/include/asm-x86/user.h b/include/asm-x86/user.h
index 484715abe74..999873b22e7 100644
--- a/include/asm-x86/user.h
+++ b/include/asm-x86/user.h
@@ -1,13 +1,5 @@
-#ifdef __KERNEL__
-# ifdef CONFIG_X86_32
-#  include "user_32.h"
-# else
-#  include "user_64.h"
-# endif
+#ifdef CONFIG_X86_32
+# include "user_32.h"
 #else
-# ifdef __i386__
-#  include "user_32.h"
-# else
-#  include "user_64.h"
-# endif
+# include "user_64.h"
 #endif