From: Shawn Guo Date: Thu, 27 Feb 2014 07:28:48 +0000 (+0800) Subject: ARM: imx6: rename pm-imx6q.c to pm-imx6.c X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=9cdde7217e92781a98de2273e66e3c8205def76f;p=linux-beck.git 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 --- 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 diff --git a/arch/arm/mach-imx/pm-imx6q.c b/arch/arm/mach-imx/pm-imx6.c similarity index 100% rename from arch/arm/mach-imx/pm-imx6q.c rename to arch/arm/mach-imx/pm-imx6.c