summaryrefslogtreecommitdiffstats
path: root/arch/arm/include/asm
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2008-09-07 19:15:31 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-10-01 16:41:10 +0100
commit5ec9407dd1196daaf12b427b351e2cd62d2a16a7 (patch)
tree023332e9fd67d7ce0897071058db87e679bce58b /arch/arm/include/asm
parent9b727abdff93b0039fba94e96216fc280af4cf01 (diff)
downloadlinux-stable-5ec9407dd1196daaf12b427b351e2cd62d2a16a7.tar.gz
linux-stable-5ec9407dd1196daaf12b427b351e2cd62d2a16a7.tar.bz2
linux-stable-5ec9407dd1196daaf12b427b351e2cd62d2a16a7.zip
[ARM] Don't include asm/elf.h in asm code
asm code really wants asm/hwcap.h, so include that instead. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/include/asm')
-rw-r--r--arch/arm/include/asm/elf.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm/include/asm/elf.h b/arch/arm/include/asm/elf.h
index 4ca751627489..7ea302c14a59 100644
--- a/arch/arm/include/asm/elf.h
+++ b/arch/arm/include/asm/elf.h
@@ -3,7 +3,6 @@
#include <asm/hwcap.h>
-#ifndef __ASSEMBLY__
/*
* ELF register definitions..
*/
@@ -17,7 +16,6 @@ typedef unsigned long elf_freg_t[3];
typedef elf_greg_t elf_gregset_t[ELF_NGREG];
typedef struct user_fp elf_fpregset_t;
-#endif
#define EM_ARM 40
#define EF_ARM_APCS26 0x08
@@ -41,7 +39,6 @@ typedef struct user_fp elf_fpregset_t;
#endif
#define ELF_ARCH EM_ARM
-#ifndef __ASSEMBLY__
/*
* This yields a string that ld.so will use to load implementation
* specific libraries for optimization. This is more specific in
@@ -59,7 +56,6 @@ typedef struct user_fp elf_fpregset_t;
#define ELF_PLATFORM (elf_platform)
extern char elf_platform[];
-#endif
/*
* This is used to ensure we don't load something for the wrong architecture.