lkml.org 
[lkml]   [2010]   [May]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
Date
SubjectRe: [PATCH -next] RapidIO,powerpc/85xx: fix device node pointer
On Fri, May 28, 2010 at 11:56 AM, Alexandre Bounine
<alexandre.bounine@idt.com> wrote:
> Fixes compile problem caused by overlapped patches.
>
> Signed-off-by: Alexandre Bounine <alexandre.bounine@idt.com>
> Cc: Matt Porter <mporter@kernel.crashing.org>
> Cc: Li Yang <leoli@freescale.com>
> Cc: Kumar Gala <galak@kernel.crashing.org>
> Cc: Grant Likely <grant.likely@secretlab.ca>
> Cc: Thomas Moll <thomas.moll@sysgo.com>

Looks correct. I've got a few other related patches, I'll pick this
up and send it to Linus through my tree.

g.

> ---
>  arch/powerpc/sysdev/fsl_rio.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/arch/powerpc/sysdev/fsl_rio.c b/arch/powerpc/sysdev/fsl_rio.c
> index cd37e49..30e1626 100644
> --- a/arch/powerpc/sysdev/fsl_rio.c
> +++ b/arch/powerpc/sysdev/fsl_rio.c
> @@ -1426,7 +1426,7 @@ int fsl_rio_setup(struct of_device *dev)
>        port->iores.flags = IORESOURCE_MEM;
>        port->iores.name = "rio_io_win";
>
> -       priv->pwirq   = irq_of_parse_and_map(dev->node, 0);
> +       priv->pwirq   = irq_of_parse_and_map(dev->dev.of_node, 0);
>        priv->bellirq = irq_of_parse_and_map(dev->dev.of_node, 2);
>        priv->txirq = irq_of_parse_and_map(dev->dev.of_node, 3);
>        priv->rxirq = irq_of_parse_and_map(dev->dev.of_node, 4);
> --
> 1.7.0.5
>
>



--
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2010-05-28 21:29    [from the cache]
©2003-2011 Jasper Spaans