diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-05-03 03:17:01 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-05-03 03:17:01 -0400 |
| commit | 53ba4f2fa73225113a488584df0d85d3cba52943 (patch) | |
| tree | d85b984d9818abc3ccc0237eb53b710d9e96c39e /drivers/rtc/rtc-twl.c | |
| parent | bd6d29c25bb1a24a4c160ec5de43e0004e01f72b (diff) | |
| parent | 66f41d4c5c8a5deed66fdcc84509376c9a0bf9d8 (diff) | |
Merge commit 'v2.6.34-rc6' into core/locking
Diffstat (limited to 'drivers/rtc/rtc-twl.c')
| -rw-r--r-- | drivers/rtc/rtc-twl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/rtc/rtc-twl.c b/drivers/rtc/rtc-twl.c index c6a83a2a722c..ed1b86828124 100644 --- a/drivers/rtc/rtc-twl.c +++ b/drivers/rtc/rtc-twl.c | |||
| @@ -57,7 +57,7 @@ enum { | |||
| 57 | REG_RTC_COMP_LSB_REG, | 57 | REG_RTC_COMP_LSB_REG, |
| 58 | REG_RTC_COMP_MSB_REG, | 58 | REG_RTC_COMP_MSB_REG, |
| 59 | }; | 59 | }; |
| 60 | const static u8 twl4030_rtc_reg_map[] = { | 60 | static const u8 twl4030_rtc_reg_map[] = { |
| 61 | [REG_SECONDS_REG] = 0x00, | 61 | [REG_SECONDS_REG] = 0x00, |
| 62 | [REG_MINUTES_REG] = 0x01, | 62 | [REG_MINUTES_REG] = 0x01, |
| 63 | [REG_HOURS_REG] = 0x02, | 63 | [REG_HOURS_REG] = 0x02, |
| @@ -80,7 +80,7 @@ const static u8 twl4030_rtc_reg_map[] = { | |||
| 80 | [REG_RTC_COMP_LSB_REG] = 0x10, | 80 | [REG_RTC_COMP_LSB_REG] = 0x10, |
| 81 | [REG_RTC_COMP_MSB_REG] = 0x11, | 81 | [REG_RTC_COMP_MSB_REG] = 0x11, |
| 82 | }; | 82 | }; |
| 83 | const static u8 twl6030_rtc_reg_map[] = { | 83 | static const u8 twl6030_rtc_reg_map[] = { |
| 84 | [REG_SECONDS_REG] = 0x00, | 84 | [REG_SECONDS_REG] = 0x00, |
| 85 | [REG_MINUTES_REG] = 0x01, | 85 | [REG_MINUTES_REG] = 0x01, |
| 86 | [REG_HOURS_REG] = 0x02, | 86 | [REG_HOURS_REG] = 0x02, |