Received: from milmhbs1.lsil.com (147.145.21.209) by coscas01.lsi.com
 (172.21.36.60) with Microsoft SMTP Server id 8.1.393.1; Mon, 21 Dec 2009
 18:44:18 -0700
Received: from mail2.lsil.com (mail2.lsil.com [147.145.40.22])	by
 milmhbs1.lsil.com (8.12.11/8.12.11) with ESMTP id nBM1iIlU022401	for
 <andy.sharp@lsi.com>; Mon, 21 Dec 2009 17:44:18 -0800
Received: from psmtp.com (na3sys009amx205.postini.com [74.125.149.45])	by
 mail2.lsil.com (8.12.11/8.12.11) with SMTP id nBM1dv12006127	for
 <andy.sharp@lsi.com>; Mon, 21 Dec 2009 17:39:58 -0800 (PST)
Received: from source ([78.24.191.182]) by na3sys009amx205.postini.com
 ([74.125.148.14]) with SMTP;	Mon, 21 Dec 2009 20:44:17 EST
Received: from localhost.localdomain ([127.0.0.1]:46788 "EHLO
        eddie.linux-mips.org" rhost-flags-OK-OK-OK-FAIL)        by
 eddie.linux-mips.org with ESMTP id S1495731AbZLVBoL (ORCPT
        <rfc822;andy.sharp@lsi.com>); Tue, 22 Dec 2009 02:44:11 +0100
Received: with ECARTIS (v1.0.0; list linux-mips); Tue, 22 Dec 2009 02:43:53
 +0100 (CET)
Received: from sj-iport-4.cisco.com ([171.68.10.86]:47018 "EHLO
        sj-iport-4.cisco.com" rhost-flags-OK-OK-OK-OK) by eddie.linux-mips.org
        with ESMTP id S1495728AbZLVBnt (ORCPT
        <rfc822;linux-mips@linux-mips.org>); Tue, 22 Dec 2009 02:43:49 +0100
Received: from sj-core-3.cisco.com ([171.68.223.137])  by sj-iport-4.cisco.com
 with ESMTP; 22 Dec 2009 01:43:43 +0000
Received: from dvomlehn-lnx2.corp.sa.net ([64.101.20.155])        by
 sj-core-3.cisco.com (8.13.8/8.14.3) with ESMTP id nBM1hhX6010842;        Tue,
 22 Dec 2009 01:43:43 GMT
From: David VomLehn <dvomlehn@cisco.com>
To: "linux-mips@linux-mips.org" <linux-mips@linux-mips.org>
CC: "ralf@linux-mips.org" <ralf@linux-mips.org>
Sender: "linux-mips-bounce@linux-mips.org" <linux-mips-bounce@linux-mips.org>
Date: Mon, 21 Dec 2009 18:43:42 -0700
Subject: [PATCH] powertv: Remove extra r4k_clockevent_init() call
Thread-Topic: [PATCH] powertv: Remove extra r4k_clockevent_init() call
Thread-Index: AcqCqEbxSWNlqOzmQAq35CBxdV+kCA==
Message-ID: <20091222014342.GA29079@dvomlehn-lnx2.corp.sa.net>
Accept-Language: en-US
Content-Language: en-US
X-MS-Exchange-Organization-AuthAs: Anonymous
X-MS-Exchange-Organization-AuthSource: coscas01.lsi.com
X-MS-Has-Attach:
X-Auto-Response-Suppress: All
X-MS-TNEF-Correlator:
x-scanned-by: MIMEDefang 2.39
errors-to: linux-mips-bounce@linux-mips.org
x-pstn-levels: (S:99.90000/99.90000 CV:99.9000 FC:95.5390 LC:95.5390
 R:95.9108 P:95.9108 M:97.0282 C:98.6951 )
x-pstn-settings: 3 (1.0000:1.0000) s cv gt3 gt2 gt1 r p m c 
x-pstn-addresses: from <dvomlehn@cisco.com> [22/1] 
x-pstn-neptune: 0/0/0.00/0
user-agent: Mutt/1.5.18 (2008-05-17)
authentication-results: sj-iport-4.cisco.com; dkim=neutral (message not
 signed) header.i=none
x-ironport-anti-spam-filtered: true
x-ironport-anti-spam-result: ApoEAPOyL0urRN+J/2dsb2JhbADAG5ZBhC4E
x-ironport-av: E=Sophos;i="4.47,434,1257120000";    d="scan'208";a="66031987"
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0

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>
---
 arch/mips/powertv/time.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/arch/mips/powertv/time.c b/arch/mips/powertv/time.c
index 1e0a5ef..9fd7b67 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();
 }

