diff options
| author | Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp> | 2006-03-27 01:16:33 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-27 08:44:50 -0800 |
| commit | d23ee8fe6e2176a9d4dbfdd18edfa1b5bc3c79a5 (patch) | |
| tree | a3c00fd0f8db10e034eefdafafdd609b45c4d5c2 /arch/mips/jmr3927 | |
| parent | e041c683412d5bf44dc2b109053e3b837b71742d (diff) | |
| download | linux-3.10-d23ee8fe6e2176a9d4dbfdd18edfa1b5bc3c79a5.tar.gz linux-3.10-d23ee8fe6e2176a9d4dbfdd18edfa1b5bc3c79a5.tar.bz2 linux-3.10-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/jmr3927')
| -rw-r--r-- | arch/mips/jmr3927/common/rtc_ds1742.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/jmr3927/common/rtc_ds1742.c b/arch/mips/jmr3927/common/rtc_ds1742.c index 9a8bff153d8..a6bd3f4d304 100644 --- a/arch/mips/jmr3927/common/rtc_ds1742.c +++ b/arch/mips/jmr3927/common/rtc_ds1742.c @@ -159,8 +159,8 @@ rtc_ds1742_init(unsigned long base) db_assert((rtc_base & 0xe0000000) == KSEG1); /* set the function pointers */ - rtc_get_time = rtc_ds1742_get_time; - rtc_set_time = rtc_ds1742_set_time; + rtc_mips_get_time = rtc_ds1742_get_time; + rtc_mips_set_time = rtc_ds1742_set_time; /* clear oscillator stop bit */ CMOS_WRITE(RTC_READ, RTC_CONTROL); |