diff options
| author | Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com> | 2021-02-04 10:24:26 +0000 |
|---|---|---|
| committer | Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com> | 2021-02-04 10:24:26 +0000 |
| commit | f7ff717143c82aff519a34979b8dfa79acf72d47 (patch) | |
| tree | 52c4353faf7f15880e860ded3a79bbec815ce629 /arch/arm/mach-imx | |
| parent | 9c8316d4da6e70ecbf18ce03c9105ed7124660d9 (diff) | |
| parent | e89428970c23011a2679121c56e9f54f654c6602 (diff) | |
Merge tag 'v5.4.95' into 5.4-2.3.x-imx
This is the 5.4.95 stable release
Signed-off-by: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com>
Diffstat (limited to 'arch/arm/mach-imx')
| -rw-r--r-- | arch/arm/mach-imx/suspend-imx6.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/suspend-imx6.S b/arch/arm/mach-imx/suspend-imx6.S index a7e349e583e7..6e8fc0d40509 100644 --- a/arch/arm/mach-imx/suspend-imx6.S +++ b/arch/arm/mach-imx/suspend-imx6.S @@ -77,6 +77,7 @@ #define MX6Q_ANATOP_CORE 0x140 .align 3 + .arm /* Check if the cpu is cortex-a7 */ .macro is_cortex_a7 |