diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-03-04 00:35:43 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-03-04 00:35:43 -0500 |
| commit | d2c032e3dc58137a7261a7824d3acce435db1d66 (patch) | |
| tree | 7eea1c7c6103eefe879f07472eec99b3c41eb792 /drivers/rtc/rtc-at91sam9.c | |
| parent | 7e8e385aaf6ed5b64b5d9108081cfcdcdd021b78 (diff) | |
| parent | 13a7a6ac0a11197edcd0f756a035f472b42cdf8b (diff) | |
Merge tag 'v4.0-rc2' into x86/asm, to refresh the tree
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/rtc/rtc-at91sam9.c')
| -rw-r--r-- | drivers/rtc/rtc-at91sam9.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/rtc/rtc-at91sam9.c b/drivers/rtc/rtc-at91sam9.c index 6b9aaf1afc72..2183fd2750ab 100644 --- a/drivers/rtc/rtc-at91sam9.c +++ b/drivers/rtc/rtc-at91sam9.c | |||
| @@ -313,7 +313,7 @@ static const struct rtc_class_ops at91_rtc_ops = { | |||
| 313 | .alarm_irq_enable = at91_rtc_alarm_irq_enable, | 313 | .alarm_irq_enable = at91_rtc_alarm_irq_enable, |
| 314 | }; | 314 | }; |
| 315 | 315 | ||
| 316 | static struct regmap_config gpbr_regmap_config = { | 316 | static const struct regmap_config gpbr_regmap_config = { |
| 317 | .reg_bits = 32, | 317 | .reg_bits = 32, |
| 318 | .val_bits = 32, | 318 | .val_bits = 32, |
| 319 | .reg_stride = 4, | 319 | .reg_stride = 4, |