Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754412Ab0GANQa (ORCPT ); Thu, 1 Jul 2010 09:16:30 -0400 Received: from mail-out.m-online.net ([212.18.0.9]:40772 "EHLO mail-out.m-online.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751769Ab0GANQ2 (ORCPT ); Thu, 1 Jul 2010 09:16:28 -0400 X-Auth-Info: 05dEiexnl7lhPMRPPgs9ir1AQn+Bfbfdui4wzLdbULA= Date: Thu, 1 Jul 2010 15:16:24 +0200 From: Anatolij Gustschin To: Dan Williams Cc: Grant Likely , Linux Kernel Mailing List , devicetree-discuss Subject: Re: [git pull] (updated) OF-related build breakage fixes Message-ID: <20100701151624.2bf6c533@wker> In-Reply-To: References: X-Mailer: Claws Mail 3.7.4 (GTK+ 2.20.1; x86_64-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1547 Lines: 47 On Thu, 1 Jul 2010 02:06:35 -0700 Dan Williams wrote: > of/dma: fix remaining ppc4xx build breakage > > From: Dan Williams > > Commit 05c02542 "of/dma: fix build breakage in ppc4xx adma driver" > missed one conversion site. > > Cc: Anatolij Gustschin > Cc: Grant Likely > Signed-off-by: Dan Williams > --- > > drivers/dma/ppc4xx/adma.c | 4 +++- > 1 files changed, 3 insertions(+), 1 deletions(-) Acked-by: Anatolij Gustschin Thanks for fixing! > > > diff --git a/drivers/dma/ppc4xx/adma.c b/drivers/dma/ppc4xx/adma.c > index 5a22ca6..7c37479 100644 > --- a/drivers/dma/ppc4xx/adma.c > +++ b/drivers/dma/ppc4xx/adma.c > @@ -4257,10 +4257,12 @@ static int ppc440spe_adma_setup_irqs(struct ppc440spe_adma_device *adev, > struct ppc440spe_adma_chan *chan, > int *initcode) > { > + struct of_device *ofdev; > struct device_node *np; > int ret; > > - np = container_of(adev->dev, struct of_device, dev)->node; > + ofdev = container_of(adev->dev, struct of_device, dev); > + np = ofdev->dev.of_node; > if (adev->id != PPC440SPE_XOR_ID) { > adev->err_irq = irq_of_parse_and_map(np, 1); > if (adev->err_irq == NO_IRQ) { -- 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/