diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-20 15:57:28 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-20 15:57:28 -0700 |
| commit | dcbb5593d980bbf4ceef320f8c75210398ed84db (patch) | |
| tree | aa712d3a48cb34087220a9af4c66953020d87ebf /arch | |
| parent | 996a798abb36aa92d0bad64ba23f4c685ce39537 (diff) | |
| download | linux-stable-dcbb5593d980bbf4ceef320f8c75210398ed84db.tar.gz linux-stable-dcbb5593d980bbf4ceef320f8c75210398ed84db.tar.bz2 linux-stable-dcbb5593d980bbf4ceef320f8c75210398ed84db.zip | |
loongson: fix cut-and-paste mis-merge
Ingo points out that I screwed up when merging the 'timers-for-linus'
branch in commit a03fdb7612874834d6847107198712d18b5242c7.
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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/mips/loongson/common/time.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/loongson/common/time.c b/arch/mips/loongson/common/time.c index 0edbef32b862..6e08c8270abe 100644 --- 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; } |