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

388128ff · Mark Brown · 329bd970 · d67c42cc · 388128ff
Commit 388128ff authored Apr 28, 2013 by Mark Brown
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

drivers/regulator/max1586.c drivers/regulator/max1586.c +1 -1

No files found.
--- 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