summaryrefslogtreecommitdiffstats
path: root/arch/mips/lasat
diff options
context:
space:
mode:
authorYoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>2006-03-27 01:16:33 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-03-27 08:44:50 -0800
commitd23ee8fe6e2176a9d4dbfdd18edfa1b5bc3c79a5 (patch)
treea3c00fd0f8db10e034eefdafafdd609b45c4d5c2 /arch/mips/lasat
parente041c683412d5bf44dc2b109053e3b837b71742d (diff)
downloadop-kernel-dev-d23ee8fe6e2176a9d4dbfdd18edfa1b5bc3c79a5.zip
op-kernel-dev-d23ee8fe6e2176a9d4dbfdd18edfa1b5bc3c79a5.tar.gz
[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')
-rw-r--r--arch/mips/lasat/setup.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/lasat/setup.c b/arch/mips/lasat/setup.c
index e9e9a89..bb70a82 100644
--- a/arch/mips/lasat/setup.c
+++ b/arch/mips/lasat/setup.c
@@ -175,8 +175,8 @@ void __init plat_setup(void)
#ifdef CONFIG_DS1603
ds1603 = &ds_defs[mips_machtype];
- rtc_get_time = ds1603_read;
- rtc_set_time = ds1603_set;
+ rtc_mips_get_time = ds1603_read;
+ rtc_mips_set_time = ds1603_set;
#endif
#ifdef DYNAMIC_SERIAL_INIT
OpenPOWER on IntegriCloud