From: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Date: Wed, 30 Nov 2011 23:05:31 +0000 (+0100)
Subject: PM / Domains: fix compilation failure for CONFIG_PM_GENERIC_DOMAINS unset
X-Git-Tag: firefly_0821_release~3680^2~3819^2~2^2~11
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=4f042cdad40e1566a53b7ae85e72b6945a4b0fde;p=firefly-linux-kernel-4.4.55.git

PM / Domains: fix compilation failure for CONFIG_PM_GENERIC_DOMAINS unset

Fix the following compalitaion breakage:

In file included from linux/drivers/sh/pm_runtime.c:15:
linux/include/linux/pm_domain.h: In function 'dev_to_genpd':
linux/include/linux/pm_domain.h:142: error: implicit declaration of function 'ERR_PTR'
linux/include/linux/pm_domain.h:142: warning: return makes pointer from integer without a cast
In file included from linux/include/linux/sh_clk.h:10,
                 from linux/drivers/sh/pm_runtime.c:19:
linux/include/linux/err.h: At top level:
linux/include/linux/err.h:22: error: conflicting types for 'ERR_PTR'
linux/include/linux/pm_domain.h:142: note: previous implicit declaration of 'ERR_PTR' was here
make[3]: *** [drivers/sh/pm_runtime.o] Error 1

Reported-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
---

diff --git a/include/linux/pm_domain.h b/include/linux/pm_domain.h
index cc1a2450ff7b..fbb81bc5065a 100644
--- a/include/linux/pm_domain.h
+++ b/include/linux/pm_domain.h
@@ -10,6 +10,7 @@
 #define _LINUX_PM_DOMAIN_H
 
 #include <linux/device.h>
+#include <linux/err.h>
 
 enum gpd_status {
 	GPD_STATE_ACTIVE = 0,	/* PM domain is active */