diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-04 20:12:31 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-04 20:12:31 -0700 |
| commit | 744c557892d3bfb575287ee95947f5c0b9a0458f (patch) | |
| tree | 02e75a88f2f0472bca3515e08c8c12468b7d1797 /drivers | |
| parent | 62fd98571727a22ef77f1a9c1637260ad5a10baa (diff) | |
| parent | 3e6b02d9f5a9715f7d4ff9e0978e5f9cef53d31f (diff) | |
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
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/dma/ppc4xx/adma.c | 4 |
1 files changed, 3 insertions, 1 deletions
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) { |