diff options
| author | Alexei Fedorov <Alexei.Fedorov@arm.com> | 2019-08-02 08:57:02 +0000 |
|---|---|---|
| committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2019-08-02 08:57:02 +0000 |
| commit | 01c44dddbda2bf74dff4bdbaee43177236982887 (patch) | |
| tree | c6f6607a5bab02c7497689e043db50fad88158f8 /include/drivers/arm/ccn.h | |
| parent | f61469e532c05bfe0de06620e8762db18414a357 (diff) | |
| parent | d5dfdeb65ff5b7f24dded201d2945c7b74565ce8 (diff) | |
Merge "Replace __ASSEMBLY__ with compiler-builtin __ASSEMBLER__" into integration
Diffstat (limited to 'include/drivers/arm/ccn.h')
| -rw-r--r-- | include/drivers/arm/ccn.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/drivers/arm/ccn.h b/include/drivers/arm/ccn.h index 9c3abac6..7f737681 100644 --- a/include/drivers/arm/ccn.h +++ b/include/drivers/arm/ccn.h @@ -46,7 +46,7 @@ */ #define CCN_GET_RUN_STATE(pstate) (pstate & 0xf) -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include <stdint.h> /* @@ -109,5 +109,5 @@ unsigned long long ccn_read_node_reg(node_types_t node_type, unsigned int node_id, unsigned int reg_offset); -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* CCN_H */ |