diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-06-29 06:35:18 -0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-06-29 06:35:18 -0400 |
| commit | 332acd9e534e0bc8713d2cb90dd2d4d5f2485401 (patch) | |
| tree | 8627f57b3c43f3612c91760292f7e7d1b47eb3d1 /arch/arm/mach-omap2/board-cm-t35.c | |
| parent | bafe2721a0fbd1cc1af04384133684f660f3658e (diff) | |
| parent | 0f622e8cae379ee17e1ffe867336b74c5b16f958 (diff) | |
Merge branch 'devel-timer' into devel-cleanup
Diffstat (limited to 'arch/arm/mach-omap2/board-cm-t35.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-cm-t35.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/board-cm-t35.c b/arch/arm/mach-omap2/board-cm-t35.c index c938984480ed..d76dca788540 100644 --- a/arch/arm/mach-omap2/board-cm-t35.c +++ b/arch/arm/mach-omap2/board-cm-t35.c | |||
| @@ -642,7 +642,7 @@ MACHINE_START(CM_T35, "Compulab CM-T35") | |||
| 642 | .reserve = omap_reserve, | 642 | .reserve = omap_reserve, |
| 643 | .map_io = omap3_map_io, | 643 | .map_io = omap3_map_io, |
| 644 | .init_early = cm_t35_init_early, | 644 | .init_early = cm_t35_init_early, |
| 645 | .init_irq = omap_init_irq, | 645 | .init_irq = omap3_init_irq, |
| 646 | .init_machine = cm_t35_init, | 646 | .init_machine = cm_t35_init, |
| 647 | .timer = &omap_timer, | 647 | .timer = &omap3_timer, |
| 648 | MACHINE_END | 648 | MACHINE_END |