From: Shane McDonald <mcdonald.shane@gmail.com>
To: linux-mips@linux-mips.org
Cc: ralf@linux-mips.org
Subject: [MIPS] Resolve multiple definition of plat_timer_setup in msp71xx
Date: Mon, 27 Apr 2009 23:50:21 -0600 [thread overview]
Message-ID: <E1LygCz-00068C-Ay@localhost> (raw)
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
next reply other threads:[~2009-04-28 5:50 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-04-28 5:50 Shane McDonald [this message]
2009-04-28 9:15 ` [MIPS] Resolve multiple definition of plat_timer_setup in msp71xx Ralf Baechle
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=E1LygCz-00068C-Ay@localhost \
--to=mcdonald.shane@gmail.com \
--cc=linux-mips@linux-mips.org \
--cc=ralf@linux-mips.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox