Commit 01caec83 authored Apr 27, 2009 by Shane McDonald Committed by Ralf Baechle May 14, 2009

MIPS: MSP71xx: Resolve multiple definition of plat_timer_setup

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>

parent ed01b3d2

arch/mips/pmc-sierra/msp71xx/msp_time.c

+2 −5

Original line number	Diff line number	Diff line
		@@ -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;
		}

Admin message