Skip to content

Commit

Permalink
MIPS: MSP71xx: Resolve multiple definition of plat_timer_setup
Browse files Browse the repository at this point in the history
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>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  • Loading branch information
Shane McDonald authored and Ralf Baechle committed May 14, 2009
1 parent ed01b3d commit 01caec8
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions arch/mips/pmc-sierra/msp71xx/msp_time.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

0 comments on commit 01caec8

Please sign in to comment.