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-davinci/da8xx-dt.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-davinci/da8xx-dt.c')
-rw-r--r-- | arch/arm/mach-davinci/da8xx-dt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-davinci/da8xx-dt.c b/arch/arm/mach-davinci/da8xx-dt.c index 37c27af18fa..9a7c76efc8f 100644 --- a/arch/arm/mach-davinci/da8xx-dt.c +++ b/arch/arm/mach-davinci/da8xx-dt.c @@ -56,7 +56,7 @@ static const char *da850_boards_compat[] __initdata = { DT_MACHINE_START(DA850_DT, "Generic DA850/OMAP-L138/AM18x") .map_io = da850_init, .init_irq = da8xx_init_irq, - .timer = &davinci_timer, + .init_time = davinci_timer_init, .init_machine = da850_init_machine, .dt_compat = da850_boards_compat, .init_late = davinci_init_late, |