Merge branch 'topic/jz' into for-linus

diff --cc drivers/dma/Kconfig
Simple merge

diff --cc drivers/dma/dma-jz4780.c
index b2a2449,e1bb93d..a8b6225
--- 1/drivers/dma/dma-jz4780.c
--- 2/drivers/dma/dma-jz4780.c
+++ b/drivers/dma/dma-jz4780.c
@@@ -881,9 -983,10 +980,9 @@@ static int jz4780_dma_remove(struct pla
  
        free_irq(jzdma->irq, jzdma);
  
-       for (i = 0; i < JZ_DMA_NR_CHANNELS; i++)
+       for (i = 0; i < jzdma->soc_data->nb_channels; i++)
                tasklet_kill(&jzdma->chan[i].vchan.task);
  
 -      dma_async_device_unregister(&jzdma->dma_device);
        return 0;
  }