Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec...

[pandora-kernel.git] / arch / arm / plat-samsung / s3c-dma-ops.c

diff --git a/arch/arm/plat-samsung/s3c-dma-ops.c b/arch/arm/plat-samsung/s3c-dma-ops.c
index 33ab324..7814949 100644 (file)
--- a/arch/arm/plat-samsung/s3c-dma-ops.c
+++ b/arch/arm/plat-samsung/s3c-dma-ops.c
@@ -14,6 +14,7 @@
 #include <linux/errno.h>
 #include <linux/slab.h>
 #include <linux/types.h>
+#include <linux/export.h>
 
 #include <mach/dma.h>
 
@@ -48,10 +49,7 @@ static unsigned s3c_dma_request(enum dma_ch dma_ch,
        data->ch = dma_ch;
        list_add_tail(&data->node, &dma_list);
 
-       if (info->direction == DMA_FROM_DEVICE)
-               s3c2410_dma_devconfig(dma_ch, S3C2410_DMASRC_HW, info->fifo);
-       else
-               s3c2410_dma_devconfig(dma_ch, S3C2410_DMASRC_MEM, info->fifo);
+       s3c2410_dma_devconfig(dma_ch, info->direction, info->fifo);
 
        if (info->cap == DMA_CYCLIC)
                s3c2410_dma_setflags(dma_ch, S3C2410_DMAF_CIRCULAR);