diff options
| -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 |