diff options
| author | Guenter Roeck | 2014-10-09 21:43:27 +0200 |
|---|---|---|
| committer | Mark Brown | 2014-10-13 13:05:58 +0200 |
| commit | 174e964ec224c3c591b83a6b5f0984d905d3678f (patch) | |
| tree | 0c1b107415fc7fa464c40142aba344354de38e00 /include/linux/regulator | |
| parent | Merge remote-tracking branches 'regulator/topic/tps65217', 'regulator/topic/t... (diff) | |
| download | kernel-qcow2-linux-174e964ec224c3c591b83a6b5f0984d905d3678f.tar.gz kernel-qcow2-linux-174e964ec224c3c591b83a6b5f0984d905d3678f.tar.xz kernel-qcow2-linux-174e964ec224c3c591b83a6b5f0984d905d3678f.zip | |
regulator: Include err.h from consumer.h to fix build failure
sh:sh2007_defconfig fails to build with the following error:
In file included from include/linux/regulator/machine.h:18:0,
from arch/sh/boards/board-sh2007.c:10:
include/linux/regulator/consumer.h: In function 'regulator_get_optional':
include/linux/regulator/consumer.h:271:2:
error: implicit declaration of function 'ERR_PTR'
include/linux/err.h: At top level:
include/linux/err.h:23:35: error: conflicting types for 'ERR_PTR'
include/linux/regulator/consumer.h:271:9:
note: previous implicit declaration of 'ERR_PTR' was here
Since consumer.h uses ERR_PTR, it should include err.h.
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Mark Brown <broonie@kernel.org>
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; |