diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-05-16 13:55:02 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-05-16 13:55:02 +1000 |
| commit | 716529caab9957789c8035b8e50f38563e28b6bd (patch) | |
| tree | fa2c5bf68f4859d5ce8c84b041e6b2ad6a9cacda /drivers/rtc/rtc-max8997.c | |
| parent | c8f5f1dd7baf729c9ff305a43477068f9a80aafb (diff) | |
| parent | 8c9a4aa19547bdaca322bf5560adb35c8d0ebaef (diff) | |
Merge branch 'akpm/master'
Diffstat (limited to 'drivers/rtc/rtc-max8997.c')
| -rw-r--r-- | drivers/rtc/rtc-max8997.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/rtc/rtc-max8997.c b/drivers/rtc/rtc-max8997.c index dacf48db7925..168390428f86 100644 --- a/drivers/rtc/rtc-max8997.c +++ b/drivers/rtc/rtc-max8997.c @@ -104,7 +104,7 @@ static int max8997_rtc_tm_to_data(struct rtc_time *tm, u8 *data) data[RTC_WEEKDAY] = 1 << tm->tm_wday; data[RTC_DATE] = tm->tm_mday; data[RTC_MONTH] = tm->tm_mon + 1; - data[RTC_YEAR] = tm->tm_year > 100 ? (tm->tm_year - 100) : 0 ; + data[RTC_YEAR] = tm->tm_year > 100 ? (tm->tm_year - 100) : 0; if (tm->tm_year < 100) { pr_warn("%s: MAX8997 RTC cannot handle the year %d." |