diff options
| author | Andre Przywara <andre.przywara@linaro.org> | 2013-09-19 18:06:39 +0200 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-10-03 08:25:58 +0200 |
| commit | d75ba503a972df09784f1a332ba356ef8b42a0a6 (patch) | |
| tree | 97d569261e731406bab117c32e189acbef6c2bb9 | |
| parent | f04c53762962280365005c9db12ab561a18f2692 (diff) | |
| download | olio-uboot-2014.01-d75ba503a972df09784f1a332ba356ef8b42a0a6.tar.xz olio-uboot-2014.01-d75ba503a972df09784f1a332ba356ef8b42a0a6.zip | |
ARM: prepare armv7.h to be included from assembly source
armv7.h contains some useful constants, but also C prototypes.
To include it also in assembly files, protect the non-assembly
part appropriately.
Signed-off-by: Andre Przywara <andre.przywara@linaro.org>
| -rw-r--r-- | arch/arm/include/asm/armv7.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/include/asm/armv7.h b/arch/arm/include/asm/armv7.h index 392d6a2db..0f7cbbfc1 100644 --- a/arch/arm/include/asm/armv7.h +++ b/arch/arm/include/asm/armv7.h @@ -7,7 +7,6 @@ */ #ifndef ARMV7_H #define ARMV7_H -#include <linux/types.h> /* Cortex-A9 revisions */ #define MIDR_CORTEX_A9_R0P1 0x410FC091 @@ -41,6 +40,9 @@ #define ARMV7_CLIDR_CTYPE_INSTRUCTION_DATA 3 #define ARMV7_CLIDR_CTYPE_UNIFIED 4 +#ifndef __ASSEMBLY__ +#include <linux/types.h> + /* * CP15 Barrier instructions * Please note that we have separate barrier instructions in ARMv7 @@ -58,4 +60,6 @@ void v7_outer_cache_inval_all(void); void v7_outer_cache_flush_range(u32 start, u32 end); void v7_outer_cache_inval_range(u32 start, u32 end); +#endif /* ! __ASSEMBLY__ */ + #endif |