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
loongson: fix cut-and-paste mis-merge
[safe/jmp/linux-2.6]
/
arch
/
mips
/
loongson
/
common
/
time.c
diff --git
a/arch/mips/loongson/common/time.c
b/arch/mips/loongson/common/time.c
index
0edbef3
..
6e08c82
100644
(file)
--- a/
arch/mips/loongson/common/time.c
+++ b/
arch/mips/loongson/common/time.c
@@
-23,6
+23,6
@@
void __init plat_time_init(void)
void read_persistent_clock(struct timespec *ts)
{
- ts->tv_sec =
return
mc146818_get_cmos_time();
+ ts->tv_sec = mc146818_get_cmos_time();
ts->tv_nsec = 0;
}