summaryrefslogtreecommitdiffstats
path: root/arch/mips/lasat
diff options
context:
space:
mode:
authorYoichi Yuasa2006-03-27 11:16:33 +0200
committerLinus Torvalds2006-03-27 18:44:50 +0200
commitd23ee8fe6e2176a9d4dbfdd18edfa1b5bc3c79a5 (patch)
treea3c00fd0f8db10e034eefdafafdd609b45c4d5c2 /arch/mips/lasat
parent[PATCH] Notifier chain update: API changes (diff)
downloadkernel-qcow2-linux-d23ee8fe6e2176a9d4dbfdd18edfa1b5bc3c79a5.tar.gz
kernel-qcow2-linux-d23ee8fe6e2176a9d4dbfdd18edfa1b5bc3c79a5.tar.xz
kernel-qcow2-linux-d23ee8fe6e2176a9d4dbfdd18edfa1b5bc3c79a5.zip
[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 e9e9a89c6741..bb70a8240e61 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