leds/acpi: Fix merge fallout from acpi_driver_data change

[linux-2.6-omap-h63xx.git] / include / asm-x86 / user.h

diff --git a/include/asm-x86/user.h b/include/asm-x86/user.h
index 484715abe74a66657ffb66fa606b973bb730b103..999873b22e7f4fd9e3531d8a19a47d2e716f96b8 100644 (file)
--- 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