diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-27 15:03:56 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-27 15:03:56 -0700 |
| commit | d855c5c909ebec61b5829c1fdb294d9cdd4ede86 (patch) | |
| tree | 4320e474beed71d449a581f42a5038b600e116f1 | |
| parent | cac7f2429872d3733dc3f9915857b1691da2eb2f (diff) | |
| parent | bc02871b4583ac2fc2567d9d1826b2857cf169ac (diff) | |
| download | linux-d855c5c909ebec61b5829c1fdb294d9cdd4ede86.tar.gz linux-d855c5c909ebec61b5829c1fdb294d9cdd4ede86.tar.bz2 linux-d855c5c909ebec61b5829c1fdb294d9cdd4ede86.zip | |
Merge tag 'regulator-v3.18-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator
Pull regulator fixes from Mark Brown:
"A couple of fixes for v3.18, one fix for an incorrect voltage to
register mapping in the rk808 driver and a fix for a build failure in
some SH defconfigs"
* tag 'regulator-v3.18-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
regulator: Include err.h from consumer.h to fix build failure
regulator: rk808: Fix min_uV for DCDC1 & DCDC2
| -rw-r--r-- | drivers/regulator/rk808-regulator.c | 2 | ||||
| -rw-r--r-- | include/linux/regulator/consumer.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/drivers/regulator/rk808-regulator.c b/drivers/regulator/rk808-regulator.c index e305416d7697..196a5c8838c4 100644 --- a/drivers/regulator/rk808-regulator.c +++ b/drivers/regulator/rk808-regulator.c @@ -44,7 +44,7 @@ static const int rk808_buck_config_regs[] = { }; static const struct regulator_linear_range rk808_buck_voltage_ranges[] = { - REGULATOR_LINEAR_RANGE(700000, 0, 63, 12500), + REGULATOR_LINEAR_RANGE(712500, 0, 63, 12500), }; static const struct regulator_linear_range rk808_buck4_voltage_ranges[] = { diff --git a/include/linux/regulator/consumer.h b/include/linux/regulator/consumer.h index d347c805f923..f540b1496e2f 100644 --- a/include/linux/regulator/consumer.h +++ b/include/linux/regulator/consumer.h @@ -35,6 +35,8 @@ #ifndef __LINUX_REGULATOR_CONSUMER_H_ #define __LINUX_REGULATOR_CONSUMER_H_ +#include <linux/err.h> + struct device; struct notifier_block; struct regmap; |