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/lib/psci/psci.h | |
| parent | f61469e532c05bfe0de06620e8762db18414a357 (diff) | |
| parent | d5dfdeb65ff5b7f24dded201d2945c7b74565ce8 (diff) | |
Merge "Replace __ASSEMBLY__ with compiler-builtin __ASSEMBLER__" into integration
Diffstat (limited to 'include/lib/psci/psci.h')
| -rw-r--r-- | include/lib/psci/psci.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/lib/psci/psci.h b/include/lib/psci/psci.h index fe279d4f..04e5e3d7 100644 --- a/include/lib/psci/psci.h +++ b/include/lib/psci/psci.h @@ -166,7 +166,7 @@ #define PSCI_RESET2_TYPE_ARCH (U(0) << PSCI_RESET2_TYPE_VENDOR_SHIFT) #define PSCI_RESET2_SYSTEM_WARM_RESET (PSCI_RESET2_TYPE_ARCH | U(0)) -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include <stdint.h> @@ -348,6 +348,6 @@ int psci_features(unsigned int psci_fid); void __dead2 psci_power_down_wfi(void); void psci_arch_setup(void); -#endif /*__ASSEMBLY__*/ +#endif /*__ASSEMBLER__*/ #endif /* PSCI_H */ |