diff options
| author | Mark Brown <broonie@sirena.org.uk> | 2013-04-27 21:13:41 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@sirena.org.uk> | 2013-04-27 21:13:41 -0400 |
| commit | 388128ffd69e09306b8f17c626fd565120c416de (patch) | |
| tree | bca57f792bf32dd024cdcfe001c6a2111dd3a2ed | |
| parent | 329bd970d8aad338b182aa0ee31a29239897151f (diff) | |
| parent | d67c42cc178fc3b8c92bb3072a70a6e418951b3f (diff) | |
Merge remote-tracking branch 'regulator/topic/max1586' into v3.9-rc8
| -rw-r--r-- | drivers/regulator/max1586.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/max1586.c b/drivers/regulator/max1586.c index 6b2217b404b2..54af61015814 100644 --- a/drivers/regulator/max1586.c +++ b/drivers/regulator/max1586.c | |||
| @@ -56,7 +56,7 @@ struct max1586_data { | |||
| 56 | * set V6 to either 0V, 1.8V, 2.5V, 3V depending on (x & 0x3) | 56 | * set V6 to either 0V, 1.8V, 2.5V, 3V depending on (x & 0x3) |
| 57 | * As regulator framework doesn't accept voltages to be 0V, we use 1uV. | 57 | * As regulator framework doesn't accept voltages to be 0V, we use 1uV. |
| 58 | */ | 58 | */ |
| 59 | static int v6_voltages_uv[] = { 1, 1800000, 2500000, 3000000 }; | 59 | static const unsigned int v6_voltages_uv[] = { 1, 1800000, 2500000, 3000000 }; |
| 60 | 60 | ||
| 61 | /* | 61 | /* |
| 62 | * V3 voltage | 62 | * V3 voltage |