Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-01 00:21:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

loongson: fix cut-and-paste mis-merge

Browse Source 
Ingo points out that I screwed up when merging the 'timers-for-linus'
branch in commit a03fdb7612.

A bit too much copy-and-pasting caused the end result to have an
extraneous 'return' in the middle of an expression.  That was obviously
bogus.  Blush.

Reported-by-with-patch: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Linus Torvalds 2009-09-20 15:57:28 -07:00
parent 996a798abb
commit dcbb5593d9
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/mips/loongson/common/time.c
View File

@ -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;
}