OMAP: hwmod: fix build break on non-OMAP4 multi-OMAP2 builds
authorPaul Walmsley <paul@pwsan.com>
Wed, 10 Aug 2011 06:57:42 +0000 (00:57 -0600)
committerTony Lindgren <tony@atomide.com>
Wed, 10 Aug 2011 09:20:43 +0000 (02:20 -0700)
commitc9a48c2aac235f7a7e31fb7214a33afcd0da26b7
tree7b69a257c00651c597d053ac4b6f01ce1257cf8e
parentd12d1fcafa8115602a8ce0c4a9256c7d3abdb5e1
OMAP: hwmod: fix build break on non-OMAP4 multi-OMAP2 builds

Builds for multi-OMAP2 (e.g., OMAP2420 with OMAP2430) with
CONFIG_ARCH_OMAP4=n fail with the following errors:

arch/arm/mach-omap2/built-in.o: In function `_enable_module':
arch/arm/mach-omap2/omap_hwmod.c:701: undefined reference to `omap4_cminst_module_enable'
arch/arm/mach-omap2/built-in.o: In function `_disable_module':
arch/arm/mach-omap2/omap_hwmod.c:726: undefined reference to `omap4_cminst_module_disable'
arch/arm/mach-omap2/built-in.o: In function `_wait_target_disable':
arch/arm/mach-omap2/omap_hwmod.c:1179: undefined reference to `omap4_cminst_wait_module_idle'

This is probably due to the preprocessor directives in
arch/arm/plat-omap/include/plat/cpu.h that convert some cpu_is_omap*()
expressions from preprocessor directives into something that is only
resolvable during runtime, if multiple OMAP2 build targets are
selected.

Thanks to Tony Lindgren <tony@atomide.com> for reporting.

Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
arch/arm/mach-omap2/cminst44xx.h