[PATCH] regulator: Include err.h from consumer.h to fix build failure

[PATCH] regulator: Include err.h from consumer.h to fix build failure

[Guenter Roeck]

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>
---
 include/linux/regulator/consumer.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/include/linux/regulator/consumer.h b/include/linux/regulator/consumer.h
index d347c80..f540b14 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;
-- 
1.9.1

Re: [PATCH] regulator: Include err.h from consumer.h to fix build failure

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 276 bytes --]

On Thu, Oct 09, 2014 at 12:43:27PM -0700, Guenter Roeck wrote:
> 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:

Applied, thanks.

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 473 bytes --]