summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx/Makefile
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2014-07-03 16:16:06 +0200
committerShawn Guo <shawn.guo@freescale.com>2014-07-18 16:11:35 +0800
commit918fb15d70f9749de3e37c0e4c606ed0adb0f63f (patch)
treea1ebaada90125e949412699675af43cc3500d4a2 /arch/arm/mach-imx/Makefile
parent8629a0f43b832573b06c27a214100c9b6398f59a (diff)
downloadlinux-918fb15d70f9749de3e37c0e4c606ed0adb0f63f.tar.gz
linux-918fb15d70f9749de3e37c0e4c606ed0adb0f63f.tar.bz2
linux-918fb15d70f9749de3e37c0e4c606ed0adb0f63f.zip
ARM: imx: imx6sx uses imx6q cpuidle code
Building a kernel for imx6sx but without imx6q support results in this link error because of the missing cpuidle driver: arch/arm/mach-imx/built-in.o: In function `imx6sx_init_late'::(.init.text+0xc228): undefined reference to `imx6q_cpuidle_init' This patch adds a Makefile entry so we always build support for the imx6q_cpuidle code when at least one of the 6sx or 6q variants are enabled. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
Diffstat (limited to 'arch/arm/mach-imx/Makefile')
-rw-r--r--arch/arm/mach-imx/Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile
index a364e2043191..a3d9712567c9 100644
--- a/arch/arm/mach-imx/Makefile
+++ b/arch/arm/mach-imx/Makefile
@@ -31,6 +31,8 @@ ifeq ($(CONFIG_CPU_IDLE),y)
obj-$(CONFIG_SOC_IMX5) += cpuidle-imx5.o
obj-$(CONFIG_SOC_IMX6Q) += cpuidle-imx6q.o
obj-$(CONFIG_SOC_IMX6SL) += cpuidle-imx6sl.o
+# i.MX6SX reuses i.MX6Q cpuidle driver
+obj-$(CONFIG_SOC_IMX6SX) += cpuidle-imx6q.o
endif
ifdef CONFIG_SND_IMX_SOC