Merge branch 'master'

[sfrench/cifs-2.6.git] / arch / mips / jmr3927 / common / rtc_ds1742.c

diff --git a/arch/mips/jmr3927/common/rtc_ds1742.c b/arch/mips/jmr3927/common/rtc_ds1742.c
index 8b407d7dc460c2a7d905c5bc43e76532734636ef..a6bd3f4d3049d56c9790a1ffb450edeb29062d16 100644 (file)
--- a/arch/mips/jmr3927/common/rtc_ds1742.c
+++ b/arch/mips/jmr3927/common/rtc_ds1742.c
@@ -41,11 +41,11 @@
 #include <linux/types.h>
 #include <linux/time.h>
 #include <linux/rtc.h>
+#include <linux/ds1742rtc.h>
 
 #include <asm/time.h>
 #include <asm/addrspace.h>
 
-#include <asm/jmr3927/ds1742rtc.h>
 #include <asm/debug.h>
 
 #define        EPOCH           2000
@@ -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);