diff options
| author | Guennadi Liakhovetski <g.liakhovetski@gmx.de> | 2011-12-01 00:05:31 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2011-12-01 21:48:17 +0100 |
| commit | 4f042cdad40e1566a53b7ae85e72b6945a4b0fde (patch) | |
| tree | 8c66d17cfe4102369c7fe9e898191373079be0a5 /include/linux/pm_domain.h | |
| parent | 0140d8bd47f798d55c3720f7fcade9e50929a5e5 (diff) | |
| download | talos-obmc-linux-4f042cdad40e1566a53b7ae85e72b6945a4b0fde.tar.gz talos-obmc-linux-4f042cdad40e1566a53b7ae85e72b6945a4b0fde.zip | |
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>
Diffstat (limited to 'include/linux/pm_domain.h')
| -rw-r--r-- | include/linux/pm_domain.h | 1 |
1 files changed, 1 insertions, 0 deletions
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 */ |
