]> git.baikalelectronics.ru Git - kernel.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)
committerArnd Bergmann <arnd@arndb.de>
Thu, 23 Aug 2012 15:16:42 +0000 (17:16 +0200)
commit45e891a817d180bed6a8450f0c02714d69f07bcb
tree82e6feadbc6a982e5c50886741da19c6b87fb867
parentdbac0f9f2db994a708ca68ad4848ee1830f7ac81
ARM: imx: build pm-imx5 code only when PM is enabled

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>
Cc: stable@vger.kernel.org
arch/arm/mach-imx/Makefile