diff options
| author | Tony Lindgren <tony@atomide.com> | 2013-04-03 13:47:59 -0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2013-04-03 13:47:59 -0400 |
| commit | 7f585bbfc54fec9dcf387fd2edb2d6f4908badf8 (patch) | |
| tree | fd79064e390217a56f77c5cd8236c0db6f8d9528 /arch/arm/mach-omap2/board-generic.c | |
| parent | 43231b5be657fde1c4ced180d829bbd59ceef9ad (diff) | |
| parent | 4615943cf3a531bc76f589c22bd366da092b7c0f (diff) | |
Merge branch 'omap-timer-for-v3.10' of git://github.com/jonhunter/linux into omap-for-v3.10/timer
Conflicts:
arch/arm/mach-omap2/timer.c
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 e54a48060198..78813b397209 100644 --- a/arch/arm/mach-omap2/board-generic.c +++ b/arch/arm/mach-omap2/board-generic.c | |||
| @@ -140,7 +140,7 @@ DT_MACHINE_START(AM33XX_DT, "Generic AM33XX (Flattened Device Tree)") | |||
| 140 | .init_irq = omap_intc_of_init, | 140 | .init_irq = omap_intc_of_init, |
| 141 | .handle_irq = omap3_intc_handle_irq, | 141 | .handle_irq = omap3_intc_handle_irq, |
| 142 | .init_machine = omap_generic_init, | 142 | .init_machine = omap_generic_init, |
| 143 | .init_time = omap3_am33xx_gptimer_timer_init, | 143 | .init_time = omap3_gptimer_timer_init, |
| 144 | .dt_compat = am33xx_boards_compat, | 144 | .dt_compat = am33xx_boards_compat, |
| 145 | .restart = am33xx_restart, | 145 | .restart = am33xx_restart, |
| 146 | MACHINE_END | 146 | MACHINE_END |