diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-02 19:49:50 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-02 19:49:50 -0700 |
| commit | d4509e5a6edf8862c18d887a642ce4994bde297d (patch) | |
| tree | 51669f2e0fa6004fb02c5907c2957a48d025c2a1 /arch | |
| parent | 0afa80ab6ff9aac57f118463699cee306ad6ed8a (diff) | |
| parent | ed01f64b831481762437c8eedddcca8481dc7f67 (diff) | |
| download | linux-d4509e5a6edf8862c18d887a642ce4994bde297d.tar.gz linux-d4509e5a6edf8862c18d887a642ce4994bde297d.tar.bz2 linux-d4509e5a6edf8862c18d887a642ce4994bde297d.zip | |
Merge branch 'merge' of git://git.secretlab.ca/git/linux-2.6
* 'merge' of git://git.secretlab.ca/git/linux-2.6:
powerpc/5200: in lpbfifo, flag DMA irqs as enabled after requesting them
powerpc/fsl: add device tree binding for QE firmware
of/flattree: Fix unhandled OF_DT_NOP tag when unflattening the device tree
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c b/arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c index 929d017535a3..d4f8be307cd5 100644 --- a/arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c +++ b/arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c @@ -481,6 +481,8 @@ mpc52xx_lpbfifo_probe(struct of_device *op, const struct of_device_id *match) if (rc) goto err_bcom_rx_irq; + lpbfifo.dma_irqs_enabled = 1; + /* Request the Bestcomm transmit (memory --> fifo) task and IRQ */ lpbfifo.bcom_tx_task = bcom_gen_bd_tx_init(2, res.start + LPBFIFO_REG_FIFO_DATA, |