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/lasat/setup.c | |
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/lasat/setup.c')
-rw-r--r-- | arch/mips/lasat/setup.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/lasat/setup.c b/arch/mips/lasat/setup.c index e9e9a89c6741..bb70a8240e61 100644 --- a/arch/mips/lasat/setup.c +++ b/arch/mips/lasat/setup.c | |||
@@ -175,8 +175,8 @@ void __init plat_setup(void) | |||
175 | 175 | ||
176 | #ifdef CONFIG_DS1603 | 176 | #ifdef CONFIG_DS1603 |
177 | ds1603 = &ds_defs[mips_machtype]; | 177 | ds1603 = &ds_defs[mips_machtype]; |
178 | rtc_get_time = ds1603_read; | 178 | rtc_mips_get_time = ds1603_read; |
179 | rtc_set_time = ds1603_set; | 179 | rtc_mips_set_time = ds1603_set; |
180 | #endif | 180 | #endif |
181 | 181 | ||
182 | #ifdef DYNAMIC_SERIAL_INIT | 182 | #ifdef DYNAMIC_SERIAL_INIT |