diff options
| author | Shawn Guo | 2013-04-01 10:29:56 +0200 |
|---|---|---|
| committer | Shawn Guo | 2013-04-01 10:29:56 +0200 |
| commit | 3ed628a8122112ee796cd643e2478c4a6def234c (patch) | |
| tree | 1e5e352eb501a2afa173989415a8b4896d4999a5 /arch/arm/mach-omap2 | |
| parent | Linux 3.9-rc5 (diff) | |
| parent | ARM: smp_twd: convert to use CLKSRC_OF init (diff) | |
| download | kernel-qcow2-linux-3ed628a8122112ee796cd643e2478c4a6def234c.tar.gz kernel-qcow2-linux-3ed628a8122112ee796cd643e2478c4a6def234c.tar.xz kernel-qcow2-linux-3ed628a8122112ee796cd643e2478c4a6def234c.zip | |
Merge remote-tracking branch 'arm-soc/clksrc/cleanup' into mxs/cleanup
Diffstat (limited to 'arch/arm/mach-omap2')
| -rw-r--r-- | arch/arm/mach-omap2/timer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c index 2bdd4cf17a8f..4fd80257c73e 100644 --- a/arch/arm/mach-omap2/timer.c +++ b/arch/arm/mach-omap2/timer.c @@ -597,7 +597,7 @@ void __init omap4_local_timer_init(void) int err; if (of_have_populated_dt()) { - twd_local_timer_of_register(); + clocksource_of_init(); return; } |