]> git.baikalelectronics.ru Git - kernel.git/commit
MIPS: SMTC: Fix xxx_clockevent_init() naming conflict for SMTC
authorKevin D. Kissell <kevink@paralogos.com>
Tue, 31 Mar 2009 11:10:32 +0000 (13:10 +0200)
committerRalf Baechle <ralf@linux-mips.org>
Thu, 14 May 2009 12:50:24 +0000 (13:50 +0100)
commitd7e8739a5cb594ab3185924d386b2decd49c9008
tree60f2c05ae4c11f6fb66831e45b62764089493324
parent1b5f437170f63284a77fcaa94605597448b7455f
MIPS: SMTC: Fix xxx_clockevent_init() naming conflict for SMTC

Commit e33a20f96789972eda4f8843506bafb79299ec1b created a name collision
in SMTC builds.  The attached patch corrects this in a a
not-too-terribly-ugly manner.  Note that the SMTC case has to come
first, because CEVT_R4K will also be true.

Signed-off-by: Kevin D. Kissell <kevink@paralogos.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
arch/mips/include/asm/time.h
arch/mips/kernel/cevt-smtc.c