Commit d855c5c9 authored by Linus Torvalds's avatar Linus Torvalds

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
parents cac7f242 bc02871b
...@@ -44,7 +44,7 @@ static const int rk808_buck_config_regs[] = { ...@@ -44,7 +44,7 @@ static const int rk808_buck_config_regs[] = {
}; };
static const struct regulator_linear_range rk808_buck_voltage_ranges[] = { 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[] = { static const struct regulator_linear_range rk808_buck4_voltage_ranges[] = {
......
...@@ -35,6 +35,8 @@ ...@@ -35,6 +35,8 @@
#ifndef __LINUX_REGULATOR_CONSUMER_H_ #ifndef __LINUX_REGULATOR_CONSUMER_H_
#define __LINUX_REGULATOR_CONSUMER_H_ #define __LINUX_REGULATOR_CONSUMER_H_
#include <linux/err.h>
struct device; struct device;
struct notifier_block; struct notifier_block;
struct regmap; struct regmap;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment