diff options
| author | Stephen Warren <swarren@nvidia.com> | 2013-01-28 10:20:34 -0700 |
|---|---|---|
| committer | Stephen Warren <swarren@nvidia.com> | 2013-01-28 10:20:34 -0700 |
| commit | f3dab3989b4282e448cba0f0708934276dcb413a (patch) | |
| tree | ed79658afd978b1e52ace0fb58d1628b79c0f78b /arch/arm/mach-omap1/board-ams-delta.c | |
| parent | 9931faca02c604c22335f5a935a501bb2ace6e20 (diff) | |
| parent | 90cf214d6a549bf482e3c5751ee256cc885b96ea (diff) | |
| download | olio-linux-3.10-f3dab3989b4282e448cba0f0708934276dcb413a.tar.xz olio-linux-3.10-f3dab3989b4282e448cba0f0708934276dcb413a.zip | |
Merge remote-tracking branch 'korg_arm-soc/timer/cleanup' into for-3.9/cleanup
Diffstat (limited to 'arch/arm/mach-omap1/board-ams-delta.c')
| -rw-r--r-- | arch/arm/mach-omap1/board-ams-delta.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap1/board-ams-delta.c b/arch/arm/mach-omap1/board-ams-delta.c index 2e98a3ac7c5..2aab761ee68 100644 --- a/arch/arm/mach-omap1/board-ams-delta.c +++ b/arch/arm/mach-omap1/board-ams-delta.c @@ -628,6 +628,6 @@ MACHINE_START(AMS_DELTA, "Amstrad E3 (Delta)") .init_irq = omap1_init_irq, .init_machine = ams_delta_init, .init_late = ams_delta_init_late, - .timer = &omap1_timer, + .init_time = omap1_timer_init, .restart = omap1_restart, MACHINE_END |