aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-mips/rtc.h
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-04-27 04:55:26 -0400
committerJeff Garzik <jeff@garzik.org>2006-04-27 04:55:26 -0400
commit9a375e93f88269bb770fb2eaa57554c975449c88 (patch)
tree4c8f6d77f0aa94fc69c5b9e75d51db1451bdf66f /include/asm-mips/rtc.h
parentb2b4b9a7c09ad66e095b13c97946a96f2dc8284e (diff)
parentacc696d93dcf993dec123d69d599979e1456ffec (diff)
Merge branch 'upstream' into max-sect
Diffstat (limited to 'include/asm-mips/rtc.h')
-rw-r--r--include/asm-mips/rtc.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-mips/rtc.h b/include/asm-mips/rtc.h
index a2abc4572b63..82ad401c7dca 100644
--- a/include/asm-mips/rtc.h
+++ b/include/asm-mips/rtc.h
@@ -32,7 +32,7 @@ static inline unsigned int get_rtc_time(struct rtc_time *time)
32{ 32{
33 unsigned long nowtime; 33 unsigned long nowtime;
34 34
35 nowtime = rtc_get_time(); 35 nowtime = rtc_mips_get_time();
36 to_tm(nowtime, time); 36 to_tm(nowtime, time);
37 time->tm_year -= 1900; 37 time->tm_year -= 1900;
38 38
@@ -47,7 +47,7 @@ static inline int set_rtc_time(struct rtc_time *time)
47 nowtime = mktime(time->tm_year+1900, time->tm_mon+1, 47 nowtime = mktime(time->tm_year+1900, time->tm_mon+1,
48 time->tm_mday, time->tm_hour, time->tm_min, 48 time->tm_mday, time->tm_hour, time->tm_min,
49 time->tm_sec); 49 time->tm_sec);
50 ret = rtc_set_time(nowtime); 50 ret = rtc_mips_set_time(nowtime);
51 51
52 return ret; 52 return ret;
53} 53}