Merge branch 'regulator-register' into regulator-drivers
Mark Brown [Mon, 9 Apr 2012 11:30:21 +0000 (12:30 +0100)]
1  2 
drivers/regulator/ad5398.c
drivers/regulator/isl6271a-regulator.c
drivers/regulator/lp3971.c
drivers/regulator/lp3972.c
drivers/regulator/max8649.c
drivers/regulator/max8660.c
drivers/regulator/max8952.c
drivers/regulator/pcap-regulator.c
drivers/regulator/pcf50633-regulator.c

Simple merge
@@@ -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,
@@@ -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,
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -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] =