]> git.karo-electronics.de Git - karo-tx-linux.git/commit
PM / Domains: fix compilation failure for CONFIG_PM_GENERIC_DOMAINS unset
authorGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Tue, 29 Nov 2011 22:52:07 +0000 (23:52 +0100)
committerRafael J. Wysocki <rjw@sisk.pl>
Tue, 29 Nov 2011 22:52:07 +0000 (23:52 +0100)
commitca548acf8501550dd0058c99d12601f9c9c49abd
tree7d4761a99f9ebdabe2b5d02f5910ebd1c3b2d5f3
parenta5469f18c8cc9834b23cc2c6f4b7aabc03f3413a
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>
include/linux/pm_domain.h