From: Arnd Bergmann <arnd@arndb.de>
Date: Thu, 30 Jun 2011 12:58:01 +0000 (+0000)
Subject: omap2+: fix build regression
X-Git-Tag: MMI-PSA29.97-13-9~18765^2^2~2^2~3
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=13340b2a1ef64891572c10927e5626e2b6a81b64;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

omap2+: fix build regression

board-generic.c now contains a reference to omap3_timer, but depends
only on ARCH_OMAP2, not on ARCH_OMAP3, which controls that symbol.
omap2_timer seems to be more appropriate anyway, so use that instead.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Tony Lindgren <tony@atomide.com>
---

diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c
index c6ecf607ebd6..54db41a84a9b 100644
--- a/arch/arm/mach-omap2/board-generic.c
+++ b/arch/arm/mach-omap2/board-generic.c
@@ -72,5 +72,5 @@ MACHINE_START(OMAP_GENERIC, "Generic OMAP24xx")
 	.init_early	= omap_generic_init_early,
 	.init_irq	= omap2_init_irq,
 	.init_machine	= omap_generic_init,
-	.timer		= &omap3_timer,
+	.timer		= &omap2_timer,
 MACHINE_END