diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-08-29 11:42:07 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-08-29 11:42:07 +0200 |
| commit | 416b0c0faf634abc09568885cb95266ce669c606 (patch) | |
| tree | bf63b94f57246fbf264c93bfdd6233395b07ef89 /drivers/rtc/rtc-ds1307.c | |
| parent | c0bb80cfa3c37fd92f066e328d83656067519a5f (diff) | |
| parent | 9c3a815f471a84811cf8021cf64aae3b8081dfde (diff) | |
| download | linux-416b0c0faf634abc09568885cb95266ce669c606.tar.gz linux-416b0c0faf634abc09568885cb95266ce669c606.tar.bz2 linux-416b0c0faf634abc09568885cb95266ce669c606.zip | |
Merge branch 'linus' into x86/apic, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/rtc/rtc-ds1307.c')
| -rw-r--r-- | drivers/rtc/rtc-ds1307.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/rtc/rtc-ds1307.c b/drivers/rtc/rtc-ds1307.c index 4fac49e55d47..4b43aa62fbc7 100644 --- a/drivers/rtc/rtc-ds1307.c +++ b/drivers/rtc/rtc-ds1307.c @@ -1301,7 +1301,6 @@ static void ds1307_clks_register(struct ds1307 *ds1307) static const struct regmap_config regmap_config = { .reg_bits = 8, .val_bits = 8, - .max_register = 0x12, }; static int ds1307_probe(struct i2c_client *client, |