From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Rafael J. Wysocki" Date: Tue, 22 Nov 2011 23:42:11 +0000 Subject: Re: [PATCH] PM: fix compile breakage on sh #ifndef CONFIG_PM_RUNTIME Message-Id: <201111230042.11704.rjw@sisk.pl> List-Id: References: In-Reply-To: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: linux-sh@vger.kernel.org On Tuesday, November 22, 2011, Guennadi Liakhovetski wrote: > On Tue, 22 Nov 2011, Rafael J. Wysocki wrote: > > > On Monday, November 21, 2011, Guennadi Liakhovetski wrote: > > > 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 > > > > > > Signed-off-by: Guennadi Liakhovetski > > > --- > > > diff --git a/include/linux/pm_domain.h b/include/linux/pm_domain.h > > > index 765083ad..b931682 100644 > > > --- a/include/linux/pm_domain.h > > > +++ b/include/linux/pm_domain.h > > > @@ -10,6 +10,7 @@ > > > #define _LINUX_PM_DOMAIN_H > > > > > > #include > > > +#include > > > > > > enum gpd_status { > > > GPD_STATE_ACTIVE = 0, /* PM domain is active */ > > > > That new #include is only necessary if CONFIG_PM_GENERIC_DOMAINS is unset, right? > > Yes, I think so. Can you respin the patch with that in mind, please? Rafael