git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...
[pandora-kernel.git]
/
arch
/
x86
/
platform
/
mrst
/
vrtc.c
diff --git
a/arch/x86/platform/mrst/vrtc.c
b/arch/x86/platform/mrst/vrtc.c
index
a8ac6f1
..
225bd0f
100644
(file)
--- a/
arch/x86/platform/mrst/vrtc.c
+++ b/
arch/x86/platform/mrst/vrtc.c
@@
-76,8
+76,8
@@
unsigned long vrtc_get_time(void)
spin_unlock_irqrestore(&rtc_lock, flags);
spin_unlock_irqrestore(&rtc_lock, flags);
- /* vRTC YEAR reg contains the offset to 19
60
*/
- year += 19
60
;
+ /* vRTC YEAR reg contains the offset to 19
72
*/
+ year += 19
72
;
printk(KERN_INFO "vRTC: sec: %d min: %d hour: %d day: %d "
"mon: %d year: %d\n", sec, min, hour, mday, mon, year);
printk(KERN_INFO "vRTC: sec: %d min: %d hour: %d day: %d "
"mon: %d year: %d\n", sec, min, hour, mday, mon, year);