diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-09-06 14:53:25 +0200 |
|---|---|---|
| committer | Shawn Guo <shawnguo@kernel.org> | 2016-09-08 16:12:10 +0200 |
| commit | d64299daf44c7ff57120a379ceb4907f19bbf041 (patch) | |
| tree | 1edd5f6b1ae65feb2e35ba8bc644e38be766077b /arch/arm | |
| parent | ARM: imx: add cpuidle support for i.mx6ul (diff) | |
| download | linux-d64299daf44c7ff57120a379ceb4907f19bbf041.tar.xz linux-d64299daf44c7ff57120a379ceb4907f19bbf041.zip | |
ARM: imx: build cpuidle-imx6sx.o for imx6ul
The imx6ul soc code gained support for cpuidle, but that causes
a link failure if CONFIG_SOC_IMX6SX is disabled:
arch/arm/mach-imx/mach-imx6ul.o: In function `imx6ul_init_late':
mach-imx6ul.c:(.init.text+0xc): undefined reference to `imx6sx_cpuidle_init'
This adds the file containing the imx6sx_cpuidle_init function
to the kernel for 6ul-only configurations.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: 547e8f526959 ("ARM: imx: add cpuidle support for i.mx6ul")
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-imx/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile index 9f5fffd62702..574e5b8c6a65 100644 --- a/arch/arm/mach-imx/Makefile +++ b/arch/arm/mach-imx/Makefile @@ -28,6 +28,7 @@ obj-$(CONFIG_SOC_IMX5) += cpuidle-imx5.o obj-$(CONFIG_SOC_IMX6Q) += cpuidle-imx6q.o obj-$(CONFIG_SOC_IMX6SL) += cpuidle-imx6sl.o obj-$(CONFIG_SOC_IMX6SX) += cpuidle-imx6sx.o +obj-$(CONFIG_SOC_IMX6UL) += cpuidle-imx6sx.o endif ifdef CONFIG_SND_IMX_SOC |