projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'linus'
[cascardo/linux.git]
/
drivers
/
rtc
/
rtc-max6902.c
diff --git
a/drivers/rtc/rtc-max6902.c
b/drivers/rtc/rtc-max6902.c
index
9eeef96
..
d941707
100644
(file)
--- a/
drivers/rtc/rtc-max6902.c
+++ b/
drivers/rtc/rtc-max6902.c
@@
-1,4
+1,4
@@
-/* drivers/
char/
max6902.c
+/* drivers/
rtc/rtc-
max6902.c
*
* Copyright (C) 2006 8D Technologies inc.
* Copyright (C) 2004 Compulab Ltd.
*
* Copyright (C) 2006 8D Technologies inc.
* Copyright (C) 2004 Compulab Ltd.
@@
-19,7
+19,6
@@
* - Initial driver creation.
*/
* - Initial driver creation.
*/
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/version.h>
#include <linux/module.h>
#include <linux/version.h>
@@
-137,7
+136,7
@@
static int max6902_get_datetime(struct device *dev, struct rtc_time *dt)
dt->tm_min = BCD2BIN(chip->buf[2]);
dt->tm_hour = BCD2BIN(chip->buf[3]);
dt->tm_mday = BCD2BIN(chip->buf[4]);
dt->tm_min = BCD2BIN(chip->buf[2]);
dt->tm_hour = BCD2BIN(chip->buf[3]);
dt->tm_mday = BCD2BIN(chip->buf[4]);
- dt->tm_mon = BCD2BIN(chip->buf[5]
- 1)
;
+ dt->tm_mon = BCD2BIN(chip->buf[5]
) - 1
;
dt->tm_wday = BCD2BIN(chip->buf[6]);
dt->tm_year = BCD2BIN(chip->buf[7]);
dt->tm_wday = BCD2BIN(chip->buf[6]);
dt->tm_year = BCD2BIN(chip->buf[7]);