]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
ARM: imx: build pm-imx5 code only when PM is enabled
authorArnd Bergmann <arnd@arndb.de>
Wed, 15 Aug 2012 21:56:39 +0000 (21:56 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 14 Sep 2012 16:59:22 +0000 (09:59 -0700)
commitc9a8543355c1d39254723d3276e32c80d349c622
treebd92521c0f7e127a84df0dccedb68a8af6ef2e7b
parent79742799664dd4ded2450740e979b2f03baa2387
ARM: imx: build pm-imx5 code only when PM is enabled

commit a28eecef8ac2671dce7d892165bf374eeaa04e15 upstream.

This moves the imx5 pm code out of the list of unconditionally
compiled files for imx5, mirroring what we already do for imx6
and how it was done before the code was move from mach-mx5 to
mach-imx in v3.3.

Without this patch, building with CONFIG_PM disabled results in:

arch/arm/mach-imx/pm-imx5.c:202:116: error: redefinition of 'imx51_pm_init'
arch/arm/mach-imx/include/mach-imx/common.h:154:91: note: previous definition of 'imx51_pm_init' was here
arch/arm/mach-imx/pm-imx5.c:209:116: error: redefinition of 'imx53_pm_init'
arch/arm/mach-imx/include/mach-imx/common.h:155:91: note: previous definition of 'imx53_pm_init' was here

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Shawn Guo <shawn.guo@linaro.org>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
arch/arm/mach-imx/Makefile