From 9a78a1781d4f70f88a335248e00a5f51f447fee7 Mon Sep 17 00:00:00 2001 From: Shane McDonald Date: Mon, 27 Apr 2009 23:50:21 -0600 Subject: [PATCH] --- yaml --- r: 144958 b: refs/heads/master c: 01caec8396eff7d519e6d85c5a1c860e7d4714e5 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/mips/pmc-sierra/msp71xx/msp_time.c | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 110c92d12bdf..cad767f3be28 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ed01b3d240b76dc1b93d08833832f9ce51a11f02 +refs/heads/master: 01caec8396eff7d519e6d85c5a1c860e7d4714e5 diff --git a/trunk/arch/mips/pmc-sierra/msp71xx/msp_time.c b/trunk/arch/mips/pmc-sierra/msp71xx/msp_time.c index 7cfeda5a651b..cca64e15f57f 100644 --- a/trunk/arch/mips/pmc-sierra/msp71xx/msp_time.c +++ b/trunk/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; }