Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[linux-2.6] / include / asm-mips / time.h

diff --git a/include/asm-mips/time.h b/include/asm-mips/time.h
index e22a2066587160d519892bdc3797b8abf3ba91c1..d897c8bb554d8e1792a4ed3a3588fdc92069517a 100644 (file)
--- a/include/asm-mips/time.h
+++ b/include/asm-mips/time.h
@@ -20,17 +20,20 @@
 #include <linux/linkage.h>
 #include <linux/ptrace.h>
 #include <linux/rtc.h>
+#include <linux/spinlock.h>
+
+extern spinlock_t rtc_lock;
 
 /*
  * RTC ops.  By default, they point to no-RTC functions.
- *     rtc_get_time - mktime(year, mon, day, hour, min, sec) in seconds.
- *     rtc_set_time - reverse the above translation and set time to RTC.
- *     rtc_set_mmss - similar to rtc_set_time, but only min and sec need
+ *     rtc_mips_get_time - mktime(year, mon, day, hour, min, sec) in seconds.
+ *     rtc_mips_set_time - reverse the above translation and set time to RTC.
+ *     rtc_mips_set_mmss - similar to rtc_set_time, but only min and sec need
  *                     to be set.  Used by RTC sync-up.
  */
-extern unsigned long (*rtc_get_time)(void);
-extern int (*rtc_set_time)(unsigned long);
-extern int (*rtc_set_mmss)(unsigned long);
+extern unsigned long (*rtc_mips_get_time)(void);
+extern int (*rtc_mips_set_time)(unsigned long);
+extern int (*rtc_mips_set_mmss)(unsigned long);
 
 /*
  * Timer interrupt functions.