From: Dan Williams <dan.j.williams@intel.com>
Date: Fri, 20 Jul 2007 01:07:36 +0000 (+0100)
Subject: [ARM] 4496/1: elf_hwcap: fix up #include misplacement
X-Git-Tag: v2.6.23-rc1~8^2^6~12
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f393e99d9e9540d9c5b3ebc42dfb0ff9a77827fe;p=linux-2.6

[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>
---

diff --git a/include/asm-arm/elf.h b/include/asm-arm/elf.h
index d7a777f050..ec1c685562 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];