From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Mon, 9 Apr 2012 11:30:21 +0000 (+0100)
Subject: Merge branch 'regulator-register' into regulator-drivers
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=1474e4dbcae04125ed6e503eadcef266846f4675;p=deliverable%2Flinux.git

Merge branch 'regulator-register' into regulator-drivers
---

1474e4dbcae04125ed6e503eadcef266846f4675
diff --cc drivers/regulator/lp3971.c
index 2013525f4bf9,3e0d001b599e..499986e00fb2
--- a/drivers/regulator/lp3971.c
+++ b/drivers/regulator/lp3971.c
@@@ -278,10 -306,10 +278,10 @@@ static struct regulator_ops lp3971_dcdc
  	.enable = lp3971_dcdc_enable,
  	.disable = lp3971_dcdc_disable,
  	.get_voltage = lp3971_dcdc_get_voltage,
 -	.set_voltage = lp3971_dcdc_set_voltage,
 +	.set_voltage_sel = lp3971_dcdc_set_voltage_sel,
  };
  
- static struct regulator_desc regulators[] = {
+ static const struct regulator_desc regulators[] = {
  	{
  		.name = "LDO1",
  		.id = LP3971_LDO1,
diff --cc drivers/regulator/lp3972.c
index 4f28d36600a5,2e48621ef8b6..fbe3a58a71f2
--- a/drivers/regulator/lp3972.c
+++ b/drivers/regulator/lp3972.c
@@@ -441,10 -468,10 +441,10 @@@ static struct regulator_ops lp3972_dcdc
  	.enable = lp3972_dcdc_enable,
  	.disable = lp3972_dcdc_disable,
  	.get_voltage = lp3972_dcdc_get_voltage,
 -	.set_voltage = lp3972_dcdc_set_voltage,
 +	.set_voltage_sel = lp3972_dcdc_set_voltage_sel,
  };
  
- static struct regulator_desc regulators[] = {
+ static const struct regulator_desc regulators[] = {
  	{
  		.name = "LDO1",
  		.id = LP3972_LDO1,
diff --cc drivers/regulator/pcf50633-regulator.c
index b62f4c856821,0f8ffed3dd22..43163f14bec7
--- a/drivers/regulator/pcf50633-regulator.c
+++ b/drivers/regulator/pcf50633-regulator.c
@@@ -267,9 -285,9 +267,9 @@@ static struct regulator_ops pcf50633_re
  	.is_enabled = pcf50633_regulator_is_enabled,
  };
  
- static struct regulator_desc regulators[] = {
+ static const struct regulator_desc regulators[] = {
  	[PCF50633_REGULATOR_AUTO] =
 -		PCF50633_REGULATOR("auto", PCF50633_REGULATOR_AUTO, 81),
 +		PCF50633_REGULATOR("auto", PCF50633_REGULATOR_AUTO, 128),
  	[PCF50633_REGULATOR_DOWN1] =
  		PCF50633_REGULATOR("down1", PCF50633_REGULATOR_DOWN1, 96),
  	[PCF50633_REGULATOR_DOWN2] =