summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid VomLehn <dvomlehn@cisco.com>2009-12-21 17:43:42 -0800
committerRalf Baechle <ralf@linux-mips.org>2010-01-12 18:19:35 +0100
commit1dc238632bbb4283ba2c789b2aeadb1a2743eb4f (patch)
tree1a3b95808fc936aa0e8828fb72ca9ecc5df615d6
parent0833c76bd894b797f353e32c5eadfe16855bcf69 (diff)
downloadlinux-3.10-1dc238632bbb4283ba2c789b2aeadb1a2743eb4f.tar.gz
linux-3.10-1dc238632bbb4283ba2c789b2aeadb1a2743eb4f.tar.bz2
linux-3.10-1dc238632bbb4283ba2c789b2aeadb1a2743eb4f.zip
MIPS: PowerTV: Remove extra r4k_clockevent_init() call
A call to r4k_clocksource_init() was added to plat_time_init(), but when init_mips_clock_source() calls the same function, boot fails in clockevents_register_device(). This patch removes the extraneous call. Signed-off-by: David VomLehn <dvomlehn@cisco.com> Patchwork: http://patchwork.linux-mips.org/patch/803/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
-rw-r--r--arch/mips/powertv/time.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/mips/powertv/time.c b/arch/mips/powertv/time.c
index 1e0a5ef4c8c..9fd7b67f2af 100644
--- a/arch/mips/powertv/time.c
+++ b/arch/mips/powertv/time.c
@@ -33,5 +33,4 @@ unsigned int __cpuinit get_c0_compare_int(void)
void __init plat_time_init(void)
{
powertv_clocksource_init();
- r4k_clockevent_init();
}