diff options
author | Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp> | 2006-03-27 04:16:33 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-27 11:44:50 -0500 |
commit | d23ee8fe6e2176a9d4dbfdd18edfa1b5bc3c79a5 (patch) | |
tree | a3c00fd0f8db10e034eefdafafdd609b45c4d5c2 /arch/mips/dec | |
parent | e041c683412d5bf44dc2b109053e3b837b71742d (diff) |
[PATCH] mips: fixed collision of rtc function name
Fix the collision of rtc function name.
Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/mips/dec')
-rw-r--r-- | arch/mips/dec/time.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/dec/time.c b/arch/mips/dec/time.c index 174822344131..f17d3378e9a6 100644 --- a/arch/mips/dec/time.c +++ b/arch/mips/dec/time.c | |||
@@ -193,8 +193,8 @@ static void dec_ioasic_hpt_init(unsigned int count) | |||
193 | 193 | ||
194 | void __init dec_time_init(void) | 194 | void __init dec_time_init(void) |
195 | { | 195 | { |
196 | rtc_get_time = dec_rtc_get_time; | 196 | rtc_mips_get_time = dec_rtc_get_time; |
197 | rtc_set_mmss = dec_rtc_set_mmss; | 197 | rtc_mips_set_mmss = dec_rtc_set_mmss; |
198 | 198 | ||
199 | mips_timer_state = dec_timer_state; | 199 | mips_timer_state = dec_timer_state; |
200 | mips_timer_ack = dec_timer_ack; | 200 | mips_timer_ack = dec_timer_ack; |