diff options
author | Max Krummenacher <max.krummenacher@toradex.com> | 2020-03-28 21:14:50 +0100 |
---|---|---|
committer | Max Krummenacher <max.krummenacher@toradex.com> | 2020-03-28 21:14:50 +0100 |
commit | 4a31b8a3519d5dde0eacbb088b0d45c83732535b (patch) | |
tree | ee0d405004393bba659643108bfe40f21788b96d /arch/arm/mach-imx/Makefile | |
parent | 73b51c4600180ca69bfa5f22ad097edbf655d0d1 (diff) | |
parent | 3b41c631678a15390920ffc1e72470e83db73ac8 (diff) |
Merge tag 'v4.4.217' into toradex_vf_4.4-next
This is the 4.4.217 stable release
Diffstat (limited to 'arch/arm/mach-imx/Makefile')
-rw-r--r-- | arch/arm/mach-imx/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile index 1fffae129a4a..c0f8b001b1ea 100644 --- a/arch/arm/mach-imx/Makefile +++ b/arch/arm/mach-imx/Makefile @@ -93,6 +93,8 @@ obj-$(CONFIG_SOC_IMX53) += suspend-imx53.o AFLAGS_suspend-vf610.o :=-Wa,-march=armv7-a obj-$(CONFIG_SOC_VF610) += suspend-vf610.o endif +AFLAGS_resume-imx6.o :=-Wa,-march=armv7-a +obj-$(CONFIG_SOC_IMX6) += resume-imx6.o obj-$(CONFIG_SOC_IMX6) += pm-imx6.o obj-$(CONFIG_SOC_VF610) += pm-vf610.o |