[SCSI] refactor sdev/starget/shost busy checking

[linux-2.6-omap-h63xx.git] / include / asm-cris / elf.h

diff --git a/include/asm-cris/elf.h b/include/asm-cris/elf.h
index 87a60bd8e6671b705b722e7d92784df52e0b90b2..f0d17fbc81bae8a53c33ae6473661cfe7ea108b7 100644 (file)
--- a/include/asm-cris/elf.h
+++ b/include/asm-cris/elf.h
@@ -5,7 +5,6 @@
  * ELF register definitions..
  */
 
-#include <asm/arch/elf.h>
 #include <asm/user.h>
 
 #define R_CRIS_NONE             0
@@ -46,6 +45,8 @@ typedef unsigned long elf_fpregset_t;
 #define ELF_DATA       ELFDATA2LSB
 #define ELF_ARCH       EM_CRIS
 
+#include <asm/arch/elf.h>
+
 /* The master for these definitions is {binutils}/include/elf/cris.h:  */
 /* User symbols in this file have a leading underscore.  */
 #define EF_CRIS_UNDERSCORE             0x00000001
@@ -87,8 +88,6 @@ typedef unsigned long elf_fpregset_t;
 
 #define ELF_PLATFORM  (NULL)
 
-#ifdef __KERNEL__
-#define SET_PERSONALITY(ex, ibcs2) set_personality((ibcs2)?PER_SVR4:PER_LINUX)
-#endif
+#define SET_PERSONALITY(ex) set_personality(PER_LINUX)
 
 #endif