Resolve multiple definition of plat_timer_setup in msp71xx
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 <[email protected]>
--- arch/mips/pmc-sierra/msp71xx/msp_time.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-)
arch/mips/pmc-sierra/msp71xx/msp_time.c +2 -5
@@ -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 ; }
Signature · 1 line
1.5.6.5
Ralf Baechle
AppliedQuoted 7 lines · Shane McDonald
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 requiredget_c0_compare_intfunction.This patch has been compile-tested against the current HEAD.
Thanks, applied to 2.6.24 and up.
Ralf