Commit 16110798 authored Jan 25, 2012 by Paul Walmsley

ARM: OMAP2+: io: fix compilation breakage on 2420-only configs



Commit 7b250aff ("ARM: OMAP: Avoid
cpu_is_omapxxxx usage until map_io is done") breaks the build on a
2420-only config on v3.3-rc1:

arch/arm/mach-omap2/built-in.o: In function `omap2430_init_early':
arch/arm/mach-omap2/io.c:406: undefined reference to `omap2_set_globals_243x'
arch/arm/mach-omap2/io.c:410: undefined reference to `omap243x_clockdomains_init'
arch/arm/mach-omap2/io.c:411: undefined reference to `omap2430_hwmod_init'

Fix by only compiling omap2420_init_early() when CONFIG_SOC_OMAP2420
is selected, and only compiling omap2430_init_early() when
CONFIG_SOC_OMAP2430 is selected.

Signed-off-by: Paul Walmsley <paul@pwsan.com>
Cc: Tony Lindgren <tony@atomide.com>

parent 6af486e2

arch/arm/mach-omap2/io.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -388,7 +388,7 @@ static void __init omap_hwmod_init_postsetup(void)
		omap_pm_if_early_init();
		}

		#ifdef CONFIG_ARCH_OMAP2
		#ifdef CONFIG_SOC_OMAP2420
		void __init omap2420_init_early(void)
		{
		omap2_set_globals_242x();
		@@ -400,7 +400,9 @@ void __init omap2420_init_early(void)
		omap_hwmod_init_postsetup();
		omap2420_clk_init();
		}
		#endif

		#ifdef CONFIG_SOC_OMAP2430
		void __init omap2430_init_early(void)
		{
		omap2_set_globals_243x();

Admin message