diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-12-03 23:59:07 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-12-03 23:59:07 -0500 |
| commit | 79acbb3ff2d8095b692e1502b9eb2ccec348de26 (patch) | |
| tree | 6ab773e5a8f9de2cd6443362b21d0d6fffe3b35e /drivers/rtc/rtc-max6902.c | |
| parent | 19a79859e168640f8e16d7b216d211c1c52b687a (diff) | |
| parent | 2b5f6dcce5bf94b9b119e9ed8d537098ec61c3d2 (diff) | |
Merge branch 'linux-2.6' into for-linus
Diffstat (limited to 'drivers/rtc/rtc-max6902.c')
| -rw-r--r-- | drivers/rtc/rtc-max6902.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/rtc/rtc-max6902.c b/drivers/rtc/rtc-max6902.c index 0b20dfacbf59..d94170728075 100644 --- a/drivers/rtc/rtc-max6902.c +++ b/drivers/rtc/rtc-max6902.c | |||
| @@ -136,7 +136,7 @@ static int max6902_get_datetime(struct device *dev, struct rtc_time *dt) | |||
| 136 | dt->tm_min = BCD2BIN(chip->buf[2]); | 136 | dt->tm_min = BCD2BIN(chip->buf[2]); |
| 137 | dt->tm_hour = BCD2BIN(chip->buf[3]); | 137 | dt->tm_hour = BCD2BIN(chip->buf[3]); |
| 138 | dt->tm_mday = BCD2BIN(chip->buf[4]); | 138 | dt->tm_mday = BCD2BIN(chip->buf[4]); |
| 139 | dt->tm_mon = BCD2BIN(chip->buf[5] - 1); | 139 | dt->tm_mon = BCD2BIN(chip->buf[5]) - 1; |
| 140 | dt->tm_wday = BCD2BIN(chip->buf[6]); | 140 | dt->tm_wday = BCD2BIN(chip->buf[6]); |
| 141 | dt->tm_year = BCD2BIN(chip->buf[7]); | 141 | dt->tm_year = BCD2BIN(chip->buf[7]); |
| 142 | 142 | ||