Skip to content

Commit

Permalink
[ARM] 4496/1: elf_hwcap: fix up #include misplacement
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Dan Williams authored and Russell King committed Jul 20, 2007
1 parent 48da78b commit f393e99
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion include/asm-arm/elf.h
Original file line number Diff line number Diff line change
@@ -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];
Expand Down

0 comments on commit f393e99

Please sign in to comment.