From 6fea4a5d67e28674dd62fccb7fa9fd0024754604 Mon Sep 17 00:00:00 2001 From: Anatolij Gustschin Date: Thu, 3 Jun 2010 02:46:37 +0200 Subject: [PATCH] --- yaml --- r: 199653 b: refs/heads/master c: 05c02542c20aa00dc9a66f4bfb1a89d1131457f2 h: refs/heads/master i: 199651: 92b359146952bb425c86d7deb9119ba6ca252b6c v: v3 --- [refs] | 2 +- trunk/drivers/dma/ppc4xx/adma.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index f3d17039ccdc..3e4fc2c86e89 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c8a4d0fd2ac2ce6b3409f51fcf918dcb3617ec97 +refs/heads/master: 05c02542c20aa00dc9a66f4bfb1a89d1131457f2 diff --git a/trunk/drivers/dma/ppc4xx/adma.c b/trunk/drivers/dma/ppc4xx/adma.c index fa98abe4686f..5a22ca6927e5 100644 --- a/trunk/drivers/dma/ppc4xx/adma.c +++ b/trunk/drivers/dma/ppc4xx/adma.c @@ -4394,7 +4394,7 @@ static void ppc440spe_adma_release_irqs(struct ppc440spe_adma_device *adev, static int __devinit ppc440spe_adma_probe(struct of_device *ofdev, const struct of_device_id *match) { - struct device_node *np = ofdev->node; + struct device_node *np = ofdev->dev.of_node; struct resource res; struct ppc440spe_adma_device *adev; struct ppc440spe_adma_chan *chan; @@ -4626,7 +4626,7 @@ static int __devinit ppc440spe_adma_probe(struct of_device *ofdev, static int __devexit ppc440spe_adma_remove(struct of_device *ofdev) { struct ppc440spe_adma_device *adev = dev_get_drvdata(&ofdev->dev); - struct device_node *np = ofdev->node; + struct device_node *np = ofdev->dev.of_node; struct resource res; struct dma_chan *chan, *_chan; struct ppc_dma_chan_ref *ref, *_ref;