linux-mips
[Top] [All Lists]

[MIPS] Resolve multiple definition of plat_timer_setup in msp71xx

To: linux-mips@linux-mips.org
Subject: [MIPS] Resolve multiple definition of plat_timer_setup in msp71xx
From: Shane McDonald <mcdonald.shane@gmail.com>
Date: Mon, 27 Apr 2009 23:50:21 -0600
Cc: ralf@linux-mips.org
Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:received:to:subject:cc :message-id:from:date; bh=Pi7CEBO/kimanAdkF4OQl3o4uoPW5dQ90YTm0Mw7nzI=; b=ZuXtP6cnIEgbPI/1tZcBCOKRoyNs9c90aAEl9WwGktVo9JSPDZ4chpxJh1mWaZ+IJC K3mGrHRAz+tfKg51WOl9xYUkA8x2dvJWijRIPO9x62N2qCLPU6uu3R87DML5sFhyI5m0 CbQnH8YqG+IrQpfnL4qPn4YWi2Lf5JC5TG9w4=
Domainkey-signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=to:subject:cc:message-id:from:date; b=miMBCtox67JBG4s44CwdLZdvRsZL8bn8qFVRGmaGZNrLohUk6yfgBKFOSOqJlCKlDx OOHXbv/0GlG7cggCrEnIP8B9muyTBZ47maFdEruESfAWDsttQuKFFCc7aCoOdRnM3TkR bUxXZNrbCggbWqp4acdSvE7v0kqSwq474q714=
Original-recipient: rfc822;linux-mips@linux-mips.org
Sender: linux-mips-bounce@linux-mips.org
There have been a number of compile problems with the msp71xx
configuration ever since it was included in the linux-mips.org
repository.  This patch resolves the "multiple definition of
plat_timer_setup" problem, and creates the required
get_c0_compare_int function.

This patch has been compile-tested against the current HEAD.

Signed-off-by: Shane McDonald <mcdonald.shane@gmail.com>
---
 arch/mips/pmc-sierra/msp71xx/msp_time.c  |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/arch/mips/pmc-sierra/msp71xx/msp_time.c 
b/arch/mips/pmc-sierra/msp71xx/msp_time.c
index 7cfeda5..cca64e1 100644
--- a/arch/mips/pmc-sierra/msp71xx/msp_time.c
+++ b/arch/mips/pmc-sierra/msp71xx/msp_time.c
@@ -81,10 +81,7 @@ void __init plat_time_init(void)
        mips_hpt_frequency = cpu_rate/2;
 }
 
-void __init plat_timer_setup(struct irqaction *irq)
+unsigned int __init get_c0_compare_int(void)
 {
-#ifdef CONFIG_IRQ_MSP_CIC
-       /* we are using the vpe0 counter for timer interrupts */
-       setup_irq(MSP_INT_VPE0_TIMER, irq);
-#endif
+       return MSP_INT_VPE0_TIMER;
 }
-- 
1.5.6.5


<Prev in Thread] Current Thread [Next in Thread>