diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 14:15:23 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 14:15:23 -0500 |
| commit | 3f00d3e8fb963968a922d821a9a53b503b687e81 (patch) | |
| tree | dfac1c73ae63f8d48340f3bbb77ee53b322c59e9 /include/asm-mips/time.h | |
| parent | 407cf84f956ee4b52da5508d5357b8ae212ff77c (diff) | |
| parent | a637a114f36b94a1ad8b9867f43bac0414958420 (diff) | |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
Diffstat (limited to 'include/asm-mips/time.h')
| -rw-r--r-- | include/asm-mips/time.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/asm-mips/time.h b/include/asm-mips/time.h index e22a20665871..9cc3564cc2c9 100644 --- a/include/asm-mips/time.h +++ b/include/asm-mips/time.h | |||
| @@ -20,6 +20,9 @@ | |||
| 20 | #include <linux/linkage.h> | 20 | #include <linux/linkage.h> |
| 21 | #include <linux/ptrace.h> | 21 | #include <linux/ptrace.h> |
| 22 | #include <linux/rtc.h> | 22 | #include <linux/rtc.h> |
| 23 | #include <linux/spinlock.h> | ||
| 24 | |||
| 25 | extern spinlock_t rtc_lock; | ||
| 23 | 26 | ||
| 24 | /* | 27 | /* |
| 25 | * RTC ops. By default, they point to no-RTC functions. | 28 | * RTC ops. By default, they point to no-RTC functions. |