Merge remote-tracking branch 'regulator/topic/max1586' into v3.9-rc8

12 years ago · 388128ffd6
parent 329bd970d8 d67c42cc17
commit 388128ffd6
1 changed files with 1 additions and 1 deletions
--- a/drivers/regulator/max1586.c
+++ b/drivers/regulator/max1586.c
@ -56,7 +56,7 @@ struct max1586_data {
 *   set V6 to either 0V, 1.8V, 2.5V, 3V depending on (x & 0x3)
 * As regulator framework doesn't accept voltages to be 0V, we use 1uV.
 */
-static int v6_voltages_uv[] = { 1, 1800000, 2500000, 3000000 };
+static const unsigned int v6_voltages_uv[] = { 1, 1800000, 2500000, 3000000 };

 /*
 * V3 voltage