diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-07-11 23:53:01 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-07-11 23:53:01 +0200 |
| commit | c2fda22207e2977d0b80eac58a9004b6f8beed6d (patch) | |
| tree | 0c82957b9d6fb53aafe0f9a9d54de6015484e3e6 /arch/arm/mach-omap2/board-generic.c | |
| parent | fdcc205fb9ba006bcd37f72e1b1b904704257351 (diff) | |
| parent | e4609747a33b903c03346eea20d811fafd462269 (diff) | |
Merge branch 'fixes-part-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 into omap/fixes
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 c6ecf607ebd..54db41a84a9 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 |