diff options
| author |   Mark Brown <broonie@kernel.org> | 2014-10-27 11:26:23 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-10-27 11:26:23 +0000 |
| commit | f3d5c5d8aa97d8b157337f49cbda585427920486 (patch) | |
| tree | 67f5a7aa3384f46a0a871c82aa3a1039eee9b051 /include/linux | |
| parent | Linux 3.18-rc2 (diff) | |
| parent | regulator: Include err.h from consumer.h to fix build failure (diff) | |
| download | linux-dev-f3d5c5d8aa97d8b157337f49cbda585427920486.tar.xz linux-dev-f3d5c5d8aa97d8b157337f49cbda585427920486.zip | |
Merge remote-tracking branch 'regulator/fix/core' into regulator-linus
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; |