diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-09-06 15:31:03 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-09-06 15:31:03 +0200 |
commit | 77dd3b3bd23111040c504be6bd873a5ad09f02df (patch) | |
tree | 119ddcdf89d6a593a8fefea530249084559eeb44 /drivers/rtc/rtc-lib.c | |
parent | 916c7a855174e3b53d182b97a26b2e27a29726a1 (diff) | |
parent | 70bb08962ea9bd50797ae9f16b2493f5f7c65053 (diff) |
Merge branch 'linus' into timers/ntp
Diffstat (limited to 'drivers/rtc/rtc-lib.c')
-rw-r--r-- | drivers/rtc/rtc-lib.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/rtc/rtc-lib.c b/drivers/rtc/rtc-lib.c index 9f996ec881c..dd70bf73ce9 100644 --- a/drivers/rtc/rtc-lib.c +++ b/drivers/rtc/rtc-lib.c @@ -51,10 +51,11 @@ EXPORT_SYMBOL(rtc_year_days); */ void rtc_time_to_tm(unsigned long time, struct rtc_time *tm) { - unsigned int days, month, year; + unsigned int month, year; + int days; days = time / 86400; - time -= days * 86400; + time -= (unsigned int) days * 86400; /* day of the week, 1970-01-01 was a Thursday */ tm->tm_wday = (days + 4) % 7; |