diff options
| author | Arnd Bergmann | 2011-06-30 14:58:01 +0200 |
|---|---|---|
| committer | Arnd Bergmann | 2011-06-30 14:58:01 +0200 |
| commit | 13340b2a1ef64891572c10927e5626e2b6a81b64 (patch) | |
| tree | 7e8059642f191ab958d029c02a8331046a93889d /arch/arm/mach-omap2/board-generic.c | |
| parent | Merge branch 'for_3.1/pm-misc' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff) | |
| download | kernel-qcow2-linux-13340b2a1ef64891572c10927e5626e2b6a81b64.tar.gz kernel-qcow2-linux-13340b2a1ef64891572c10927e5626e2b6a81b64.tar.xz kernel-qcow2-linux-13340b2a1ef64891572c10927e5626e2b6a81b64.zip | |
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>
Diffstat (limited to 'arch/arm/mach-omap2/board-generic.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-generic.c | 2 |
1 files changed, 1 insertions, 1 deletions
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 |