diff options
| -rw-r--r-- | arch/arm/mach-imx/Makefile | 4 | ||||
| -rw-r--r-- | arch/arm/mach-imx/pm-imx6.c (renamed from arch/arm/mach-imx/pm-imx6q.c) | 0 |
2 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile index 9c776a03bb40..19a6d0e98f2d 100644 --- a/arch/arm/mach-imx/Makefile +++ b/arch/arm/mach-imx/Makefile | |||
| @@ -104,9 +104,7 @@ obj-$(CONFIG_SOC_IMX6SL) += clk-imx6sl.o mach-imx6sl.o | |||
| 104 | 104 | ||
| 105 | AFLAGS_suspend-imx6.o :=-Wa,-march=armv7-a | 105 | AFLAGS_suspend-imx6.o :=-Wa,-march=armv7-a |
| 106 | obj-$(CONFIG_SUSPEND) += suspend-imx6.o | 106 | obj-$(CONFIG_SUSPEND) += suspend-imx6.o |
| 107 | obj-$(CONFIG_SOC_IMX6Q) += pm-imx6q.o | 107 | obj-$(CONFIG_SOC_IMX6) += pm-imx6.o |
| 108 | # i.MX6SL reuses i.MX6Q code | ||
| 109 | obj-$(CONFIG_SOC_IMX6SL) += pm-imx6q.o | ||
| 110 | 108 | ||
| 111 | # i.MX5 based machines | 109 | # i.MX5 based machines |
| 112 | obj-$(CONFIG_MACH_MX51_BABBAGE) += mach-mx51_babbage.o | 110 | obj-$(CONFIG_MACH_MX51_BABBAGE) += mach-mx51_babbage.o |
diff --git a/arch/arm/mach-imx/pm-imx6q.c b/arch/arm/mach-imx/pm-imx6.c index 16f0d249f6a7..16f0d249f6a7 100644 --- a/arch/arm/mach-imx/pm-imx6q.c +++ b/arch/arm/mach-imx/pm-imx6.c | |||