diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-28 01:03:56 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-28 01:03:56 +0300 |
| commit | d855c5c909ebec61b5829c1fdb294d9cdd4ede86 (patch) | |
| tree | 4320e474beed71d449a581f42a5038b600e116f1 /include/linux | |
| parent | cac7f2429872d3733dc3f9915857b1691da2eb2f (diff) | |
| parent | bc02871b4583ac2fc2567d9d1826b2857cf169ac (diff) | |
| download | linux-d855c5c909ebec61b5829c1fdb294d9cdd4ede86.tar.xz | |
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
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/regulator/consumer.h | 2 |
1 files changed, 2 insertions, 0 deletions
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; |