diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2011-09-19 10:26:54 +0900 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2011-09-19 10:26:54 +0900 |
| commit | 219c8c866ceee3dbfeb1194ce06e9c729f1d379c (patch) | |
| tree | 618b6761caa3316b535ad458d9dff3ee3bc4d86c /arch/arm/mach-s3c2412/dma.c | |
| parent | b6fd41e29dea9c6753b1843a77e50433e6123bcb (diff) | |
| parent | 51ddf31da16b1ab9da861eafedad6d263faf4388 (diff) | |
Merge branch 'samsung_dma' of git://git.infradead.org/users/vkoul/slave-dma into next/topic-dma-samsung
Diffstat (limited to 'arch/arm/mach-s3c2412/dma.c')
| -rw-r--r-- | arch/arm/mach-s3c2412/dma.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-s3c2412/dma.c b/arch/arm/mach-s3c2412/dma.c index 7abecfca0b7..b4fc3ba367d 100644 --- a/arch/arm/mach-s3c2412/dma.c +++ b/arch/arm/mach-s3c2412/dma.c @@ -148,11 +148,11 @@ static struct s3c24xx_dma_map __initdata s3c2412_dma_mappings[] = { static void s3c2412_dma_direction(struct s3c2410_dma_chan *chan, struct s3c24xx_dma_map *map, - enum s3c2410_dmasrc dir) + enum dma_data_direction dir) { unsigned long chsel; - if (dir == S3C2410_DMASRC_HW) + if (dir == DMA_FROM_DEVICE) chsel = map->channels_rx[0]; else chsel = map->channels[0]; |