Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma

[linux-2.6-block.git] / drivers / video / fbdev / mx3fb.c

diff --git a/drivers/video/fbdev/mx3fb.c b/drivers/video/fbdev/mx3fb.c
index cdbc93a921851f488b6a8d17bb72a223397d173e..23ec781e9a619a6f4eb745b76cc9a7343eca6eca 100644 (file)
--- a/drivers/video/fbdev/mx3fb.c
+++ b/drivers/video/fbdev/mx3fb.c
@@ -1178,7 +1178,7 @@ static int mx3fb_pan_display(struct fb_var_screeninfo *var,
 
        /*
         * We enable the End of Frame interrupt, which will free a tx-descriptor,
-        * which we will need for the next device_prep_slave_sg(). The
+        * which we will need for the next dmaengine_prep_slave_sg(). The
         * IRQ-handler will disable the IRQ again.
         */
        init_completion(&mx3_fbi->flip_cmpl);