From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 5 Jul 2010 03:12:31 +0000 (-0700)
Subject: Merge branch 'merge-devicetree' of git://git.secretlab.ca/git/linux-2.6
X-Git-Tag: v2.6.35-rc4~5
X-Git-Url: https://bbs.cooldavid.org/git/?a=commitdiff_plain;h=744c557892d3bfb575287ee95947f5c0b9a0458f;hp=62fd98571727a22ef77f1a9c1637260ad5a10baa;p=net-next-2.6.git

Merge branch 'merge-devicetree' of git://git.secretlab.ca/git/linux-2.6

* 'merge-devicetree' of git://git.secretlab.ca/git/linux-2.6:
  of/dma: fix build breakage in ppc4xx adma driver
---

diff --git a/drivers/dma/ppc4xx/adma.c b/drivers/dma/ppc4xx/adma.c
index 5a22ca6927e..7c3747902a3 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) {