Skip to content

Commit

Permalink
PM / Domains: fix compilation failure for CONFIG_PM_GENERIC_DOMAINS u…
Browse files Browse the repository at this point in the history
…nset

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>
  • Loading branch information
Guennadi Liakhovetski authored and Rafael J. Wysocki committed Dec 1, 2011
1 parent 0140d8b commit 4f042cd
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions include/linux/pm_domain.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down

0 comments on commit 4f042cd

Please sign in to comment.