diff options
| author | Barry Song <Barry.Song@csr.com> | 2011-10-24 05:40:40 -0400 |
|---|---|---|
| committer | Barry Song <Barry.Song@csr.com> | 2011-10-24 05:45:43 -0400 |
| commit | 1e11bec9b09a28f81dd3173fec6b1c6c56b5e299 (patch) | |
| tree | cddb92f82bda3a5f362bb6d9f775d25dd1205e6b /drivers/rtc/rtc-lib.c | |
| parent | 2558bd99cb1426a05ac8f1c78dc9c75a83ceb4bb (diff) | |
| parent | 91c2ebb90b1890abc648ba9dec5608cbc97e1cb9 (diff) | |
Merge branch 'l2x0' of rmk tree into prima2-l2x0
Diffstat (limited to 'drivers/rtc/rtc-lib.c')
| -rw-r--r-- | drivers/rtc/rtc-lib.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/rtc/rtc-lib.c b/drivers/rtc/rtc-lib.c index 075f1708deae..c4cf05731118 100644 --- a/drivers/rtc/rtc-lib.c +++ b/drivers/rtc/rtc-lib.c | |||
| @@ -85,6 +85,8 @@ void rtc_time_to_tm(unsigned long time, struct rtc_time *tm) | |||
| 85 | time -= tm->tm_hour * 3600; | 85 | time -= tm->tm_hour * 3600; |
| 86 | tm->tm_min = time / 60; | 86 | tm->tm_min = time / 60; |
| 87 | tm->tm_sec = time - tm->tm_min * 60; | 87 | tm->tm_sec = time - tm->tm_min * 60; |
| 88 | |||
| 89 | tm->tm_isdst = 0; | ||
| 88 | } | 90 | } |
| 89 | EXPORT_SYMBOL(rtc_time_to_tm); | 91 | EXPORT_SYMBOL(rtc_time_to_tm); |
| 90 | 92 | ||