Add the #ifdef __ASSEMBLY__ checks to enable inclusion of this header from assembler files.
Signed-off-by: Stefan Roese sr@denx.de ---
arch/mips/mach-octeon/include/mach/octeon-model.h | 4 ++++ 1 file changed, 4 insertions(+)
diff --git a/arch/mips/mach-octeon/include/mach/octeon-model.h b/arch/mips/mach-octeon/include/mach/octeon-model.h index 209e813a2f..c842f894bf 100644 --- a/arch/mips/mach-octeon/include/mach/octeon-model.h +++ b/arch/mips/mach-octeon/include/mach/octeon-model.h @@ -266,6 +266,8 @@ ))); \ })
+#ifndef __ASSEMBLY__ + #ifndef OCTEON_IS_MODEL
static inline int __octeon_is_model_runtime_internal__(u32 model) @@ -314,4 +316,6 @@ static inline u32 cvmx_get_octeon_family(void) return (read_c0_prid() & OCTEON_FAMILY_MASK); }
+#endif /* __ASSEMBLY__ */ + #endif /* __OCTEON_MODEL_H__ */