diff options
| author | Mark Brown | 2014-11-26 21:37:57 +0100 |
|---|---|---|
| committer | Mark Brown | 2014-11-26 21:37:57 +0100 |
| commit | cf2394f70cf7774a107fbaa1ef5010db4bd69baa (patch) | |
| tree | e79e3e479d04213a67ecd47b31c7db648b0313c2 /include/linux/regulator | |
| parent | regulator: max77802: Fill regulator modes translation callback (diff) | |
| parent | Linux 3.18-rc4 (diff) | |
| download | kernel-qcow2-linux-cf2394f70cf7774a107fbaa1ef5010db4bd69baa.tar.gz kernel-qcow2-linux-cf2394f70cf7774a107fbaa1ef5010db4bd69baa.tar.xz kernel-qcow2-linux-cf2394f70cf7774a107fbaa1ef5010db4bd69baa.zip | |
Merge tag 'v3.18-rc4' into regulator-max77802
Linux 3.18-rc4
Diffstat (limited to 'include/linux/regulator')
| -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; |