From 7ded2419aa194b0f27466318d1d1aab4643340b1 Mon Sep 17 00:00:00 2001 From: Joe Perches Date: Thu, 2 Jul 2009 14:08:03 +1000 Subject: [PATCH] --- yaml --- r: 162627 b: refs/heads/master c: c573b29baf3e1b71a60ee6de76dd28c9c49fb87f h: refs/heads/master i: 162625: fdf9f91f4245b5ae0386817b25d8a2a85998f63b 162623: 5d9bd3eed3dd364f710b8205a84a1aed7dafe2c2 v: v3 --- [refs] | 2 +- trunk/arch/m68knommu/kernel/time.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index ae19ce28e603..87b24b647f41 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 732c611e5bbb76201397297f834dddd5ab684b05 +refs/heads/master: c573b29baf3e1b71a60ee6de76dd28c9c49fb87f diff --git a/trunk/arch/m68knommu/kernel/time.c b/trunk/arch/m68knommu/kernel/time.c index d182b2f72211..c2aa717de08a 100644 --- a/trunk/arch/m68knommu/kernel/time.c +++ b/trunk/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); } unsigned long read_persistent_clock(void)