Merge tag 'sound-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

[firefly-linux-kernel-4.4.55.git] / drivers / dma / imx-dma.c

diff --git a/drivers/dma/imx-dma.c b/drivers/dma/imx-dma.c
index 41b4376eb61467c4003933543bf56f2359c7fe83..f11b5b2b1a1c1e41274ed7578ba197971e209f5a 100644 (file)
--- a/drivers/dma/imx-dma.c
+++ b/drivers/dma/imx-dma.c
@@ -28,7 +28,7 @@
 #include <linux/module.h>
 
 #include <asm/irq.h>
-#include <mach/dma.h>
+#include <linux/platform_data/dma-imx.h>
 #include <mach/hardware.h>
 
 #include "dmaengine.h"
@@ -572,8 +572,8 @@ static void imxdma_tasklet(unsigned long data)
        if (desc->desc.callback)
                desc->desc.callback(desc->desc.callback_param);
 
-       /* If we are dealing with a cyclic descriptor keep it on ld_active
-        * and dont mark the descripor as complete.
+       /* If we are dealing with a cyclic descriptor, keep it on ld_active
+        * and dont mark the descriptor as complete.
         * Only in non-cyclic cases it would be marked as complete
         */
        if (imxdma_chan_is_doing_cyclic(imxdmac))