diff options
| author | Stephen Warren <swarren@nvidia.com> | 2013-01-28 12:20:34 -0500 |
|---|---|---|
| committer | Stephen Warren <swarren@nvidia.com> | 2013-01-28 12:20:34 -0500 |
| commit | f3dab3989b4282e448cba0f0708934276dcb413a (patch) | |
| tree | ed79658afd978b1e52ace0fb58d1628b79c0f78b /arch/arm/mach-omap1/board-fsample.c | |
| parent | 9931faca02c604c22335f5a935a501bb2ace6e20 (diff) | |
| parent | 90cf214d6a549bf482e3c5751ee256cc885b96ea (diff) | |
Merge remote-tracking branch 'korg_arm-soc/timer/cleanup' into for-3.9/cleanup
Diffstat (limited to 'arch/arm/mach-omap1/board-fsample.c')
| -rw-r--r-- | arch/arm/mach-omap1/board-fsample.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap1/board-fsample.c b/arch/arm/mach-omap1/board-fsample.c index 560a7dcf0a56..702d58039cc1 100644 --- a/arch/arm/mach-omap1/board-fsample.c +++ b/arch/arm/mach-omap1/board-fsample.c | |||
| @@ -364,6 +364,6 @@ MACHINE_START(OMAP_FSAMPLE, "OMAP730 F-Sample") | |||
| 364 | .init_irq = omap1_init_irq, | 364 | .init_irq = omap1_init_irq, |
| 365 | .init_machine = omap_fsample_init, | 365 | .init_machine = omap_fsample_init, |
| 366 | .init_late = omap1_init_late, | 366 | .init_late = omap1_init_late, |
| 367 | .timer = &omap1_timer, | 367 | .init_time = omap1_timer_init, |
| 368 | .restart = omap1_restart, | 368 | .restart = omap1_restart, |
| 369 | MACHINE_END | 369 | MACHINE_END |