summaryrefslogtreecommitdiff
path: root/arch/arm/mach-imx/Makefile
diff options
context:
space:
mode:
authorShawn Guo <shawn.guo@linaro.org>2014-02-27 15:28:48 +0800
committerShawn Guo <shawn.guo@linaro.org>2014-03-05 10:48:24 +0800
commit9cdde7217e92781a98de2273e66e3c8205def76f (patch)
tree973b8df5b3773f7b0507a856e9eabf7d96e05475 /arch/arm/mach-imx/Makefile
parent94f890ec91c8691c1840dc2bb36972cec3d050a7 (diff)
ARM: imx6: rename pm-imx6q.c to pm-imx6.c
The pm-imx6q.c works for all i.MX6 SoCs, so let's rename it to pm-imx6.c and have the build controlled by option CONFIG_SOC_IMX6. Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Diffstat (limited to 'arch/arm/mach-imx/Makefile')
-rw-r--r--arch/arm/mach-imx/Makefile4
1 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
AFLAGS_suspend-imx6.o :=-Wa,-march=armv7-a
obj-$(CONFIG_SUSPEND) += suspend-imx6.o
-obj-$(CONFIG_SOC_IMX6Q) += pm-imx6q.o
-# i.MX6SL reuses i.MX6Q code
-obj-$(CONFIG_SOC_IMX6SL) += pm-imx6q.o
+obj-$(CONFIG_SOC_IMX6) += pm-imx6.o
# i.MX5 based machines
obj-$(CONFIG_MACH_MX51_BABBAGE) += mach-mx51_babbage.o