nl80211: Fix comment merge error

[deliverable/linux.git] / include / asm-arm / elf.h

diff --git a/include/asm-arm/elf.h b/include/asm-arm/elf.h
index ec1c685562ce2ec19366c4e93cc1c6988a1cf5f3..4ca7516274898dafae96518f76a4f6656a352264 100644 (file)
--- a/include/asm-arm/elf.h
+++ b/include/asm-arm/elf.h
@@ -41,7 +41,6 @@ typedef struct user_fp elf_fpregset_t;
 #endif
 #define ELF_ARCH       EM_ARM
 
-#ifdef __KERNEL__
 #ifndef __ASSEMBLY__
 /*
  * This yields a string that ld.so will use to load implementation
@@ -115,5 +114,3 @@ extern char elf_platform[];
        } while (0)
 
 #endif
-
-#endif