diff options
| author | Greg KH <gregkh@suse.de> | 2005-09-12 15:10:59 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-09-12 15:10:59 -0400 |
| commit | ad2c10f8f00d3fe2e37dd8a107e7cf4ac0459489 (patch) | |
| tree | 5571f6a5784f51efddf9c1ee0408894cd63a460f /arch/mips/kernel/genrtc.c | |
| parent | 6b7839007098a6b5612d31690e11277d4242e6ae (diff) | |
| parent | 2ade81473636b33aaac64495f89a7dc572c529f0 (diff) | |
Merge ../torvalds-2.6/
Diffstat (limited to 'arch/mips/kernel/genrtc.c')
| -rw-r--r-- | arch/mips/kernel/genrtc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/kernel/genrtc.c b/arch/mips/kernel/genrtc.c index 288bf51ad4ec..71416e7bbbaa 100644 --- a/arch/mips/kernel/genrtc.c +++ b/arch/mips/kernel/genrtc.c | |||
| @@ -14,7 +14,7 @@ | |||
| 14 | #include <asm/rtc.h> | 14 | #include <asm/rtc.h> |
| 15 | #include <asm/time.h> | 15 | #include <asm/time.h> |
| 16 | 16 | ||
| 17 | static spinlock_t mips_rtc_lock = SPIN_LOCK_UNLOCKED; | 17 | static DEFINE_SPINLOCK(mips_rtc_lock); |
| 18 | 18 | ||
| 19 | unsigned int get_rtc_time(struct rtc_time *time) | 19 | unsigned int get_rtc_time(struct rtc_time *time) |
| 20 | { | 20 | { |