diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-04-09 07:30:21 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-04-09 07:30:21 -0400 |
| commit | 1474e4dbcae04125ed6e503eadcef266846f4675 (patch) | |
| tree | b65a1fb53b4c3c2fb669883faf0b87166b45baaf /drivers/regulator/pcap-regulator.c | |
| parent | f604c10cdeba4e068afa96be2bee878fb5227f8b (diff) | |
| parent | 09de3473c7724d7a1db7596acc2ce411e5e72f63 (diff) | |
Merge branch 'regulator-register' into regulator-drivers
Diffstat (limited to 'drivers/regulator/pcap-regulator.c')
| -rw-r--r-- | drivers/regulator/pcap-regulator.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/pcap-regulator.c b/drivers/regulator/pcap-regulator.c index 781bf343453b..b55128db07cc 100644 --- a/drivers/regulator/pcap-regulator.c +++ b/drivers/regulator/pcap-regulator.c | |||
| @@ -241,7 +241,7 @@ static struct regulator_ops pcap_regulator_ops = { | |||
| 241 | .owner = THIS_MODULE, \ | 241 | .owner = THIS_MODULE, \ |
| 242 | } | 242 | } |
| 243 | 243 | ||
| 244 | static struct regulator_desc pcap_regulators[] = { | 244 | static const struct regulator_desc pcap_regulators[] = { |
| 245 | VREG(V1), VREG(V2), VREG(V3), VREG(V4), VREG(V5), VREG(V6), VREG(V7), | 245 | VREG(V1), VREG(V2), VREG(V3), VREG(V4), VREG(V5), VREG(V6), VREG(V7), |
| 246 | VREG(V8), VREG(V9), VREG(V10), VREG(VAUX1), VREG(VAUX2), VREG(VAUX3), | 246 | VREG(V8), VREG(V9), VREG(V10), VREG(VAUX1), VREG(VAUX2), VREG(VAUX3), |
| 247 | VREG(VAUX4), VREG(VSIM), VREG(VSIM2), VREG(VVIB), VREG(SW1), VREG(SW2), | 247 | VREG(VAUX4), VREG(VSIM), VREG(VSIM2), VREG(VVIB), VREG(SW1), VREG(SW2), |