lkml.org 
[lkml]   [2011]   [Nov]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
SubjectRe: [PATCH] pm/next: Fix Build pm by ERR_PTR
Date
On Tuesday, November 29, 2011, Nobuhiro Iwamatsu wrote:
> ERR_PTR needs linux/err.h.
> This add linux/err.h to linux/pm_domain.h.
>
> -----
> In file included from drivers/sh/pm_runtime.c:15:
> include/linux/pm_domain.h: In function 'dev_to_genpd':
> include/linux/pm_domain.h:145: error: implicit declaration of function 'ERR_PTR'
> include/linux/pm_domain.h:145: warning: return makes pointer from integer without a cast
> In file included from include/linux/sh_clk.h:10,
> from drivers/sh/pm_runtime.c:19:
> include/linux/err.h: At top level:
> include/linux/err.h:22: error: conflicting types for 'ERR_PTR'
> include/linux/pm_domain.h:145: note: previous implicit declaration of 'ERR_PTR' was here
> make[2]: *** [drivers/sh/pm_runtime.o] Error 1
> make[1]: *** [drivers/sh] Error 2
> -----
>
> Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>

I've just added an analogous patch from Guennadi to linux-pm/linux-next.

Thanks,
Rafael


> ---
> 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 cc1a245..919bee1 100644
> --- a/include/linux/pm_domain.h
> +++ b/include/linux/pm_domain.h
> @@ -9,6 +9,7 @@
> #ifndef _LINUX_PM_DOMAIN_H
> #define _LINUX_PM_DOMAIN_H
>
> +#include <linux/err.h>
> #include <linux/device.h>
>
> enum gpd_status {
>



\
 
 \ /
  Last update: 2011-11-30 00:03    [W:0.034 / U:0.088 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site