diff options
| author | Anton Vorontsov <cbouatmailru@gmail.com> | 2012-01-10 11:55:11 -0500 |
|---|---|---|
| committer | Anton Vorontsov <cbouatmailru@gmail.com> | 2012-01-10 11:55:11 -0500 |
| commit | 913272b3864d6da89c70d9fc2c30ccb57794b369 (patch) | |
| tree | 4fb0a8ab1b53623d2a8ea200b80a3ace2d271471 /include/linux/mfd | |
| parent | 6cfc2a23540667cff6da6e41d1f1167a9a45aa9a (diff) | |
| parent | 629bcb4b72d49b3631ae3dd0fe1d345820fadfcc (diff) | |
Merge git://git.infradead.org/users/cbou/battery-urgent
Diffstat (limited to 'include/linux/mfd')
| -rw-r--r-- | include/linux/mfd/tps65910.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/mfd/tps65910.h b/include/linux/mfd/tps65910.h index 82b4c8801a4f..8bf2cb9502dd 100644 --- a/include/linux/mfd/tps65910.h +++ b/include/linux/mfd/tps65910.h | |||
| @@ -243,7 +243,8 @@ | |||
| 243 | 243 | ||
| 244 | 244 | ||
| 245 | /*Registers VDD1, VDD2 voltage values definitions */ | 245 | /*Registers VDD1, VDD2 voltage values definitions */ |
| 246 | #define VDD1_2_NUM_VOLTS 73 | 246 | #define VDD1_2_NUM_VOLT_FINE 73 |
| 247 | #define VDD1_2_NUM_VOLT_COARSE 3 | ||
| 247 | #define VDD1_2_MIN_VOLT 6000 | 248 | #define VDD1_2_MIN_VOLT 6000 |
| 248 | #define VDD1_2_OFFSET 125 | 249 | #define VDD1_2_OFFSET 125 |
| 249 | 250 | ||