git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[safe/jmp/linux-2.6]
/
arch
/
m68knommu
/
kernel
/
time.c
diff --git
a/arch/m68knommu/kernel/time.c
b/arch/m68knommu/kernel/time.c
index
6843224
..
a90acf5
100644
(file)
--- a/
arch/m68knommu/kernel/time.c
+++ b/
arch/m68knommu/kernel/time.c
@@
-69,7
+69,7
@@
static unsigned long read_rtc_mmss(void)
if ((year += 1900) < 1970)
year += 100;
- return mktime(year, mon, day, hour, min, sec);
;
+ return mktime(year, mon, day, hour, min, sec);
}
void read_persistent_clock(struct timespec *ts)