diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2007-07-20 02:07:36 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2007-07-20 21:29:18 +0100 |
| commit | f393e99d9e9540d9c5b3ebc42dfb0ff9a77827fe (patch) | |
| tree | e946d8803a20e702c0c5064d22415afae3c5a86c /include/asm-arm | |
| parent | 48da78bc93b087eadd8fa840ba661b9442846dee (diff) | |
| download | linux-3.10-f393e99d9e9540d9c5b3ebc42dfb0ff9a77827fe.tar.gz linux-3.10-f393e99d9e9540d9c5b3ebc42dfb0ff9a77827fe.tar.bz2 linux-3.10-f393e99d9e9540d9c5b3ebc42dfb0ff9a77827fe.zip | |
[ARM] 4496/1: elf_hwcap: fix up #include misplacement
While bisecting an iop13xx compile failure I noticed that
include/asm-arm/hwcap.h should be included from include/asm-arm/elf.h
outside #ifndef __ASSEMBLY__ since hwcap.h has its own __ASSEMBLY__
protections.
Cc: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'include/asm-arm')
| -rw-r--r-- | include/asm-arm/elf.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/asm-arm/elf.h b/include/asm-arm/elf.h index d7a777f0508..ec1c685562c 100644 --- a/include/asm-arm/elf.h +++ b/include/asm-arm/elf.h @@ -1,13 +1,14 @@ #ifndef __ASMARM_ELF_H #define __ASMARM_ELF_H +#include <asm/hwcap.h> + #ifndef __ASSEMBLY__ /* * ELF register definitions.. */ #include <asm/ptrace.h> #include <asm/user.h> -#include <asm/hwcap.h> typedef unsigned long elf_greg_t; typedef unsigned long elf_freg_t[3]; |