diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-02-05 08:25:21 -0500 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-02-05 08:25:21 -0500 |
| commit | 4285431fb658263e98942ce2320b0b26eddcc06d (patch) | |
| tree | 49bce2d36917cb628ccddee55a47026da2ed90db /arch/arm/mach-s3c2410/s3c2412-dma.c | |
| parent | c033a7e3d593554ba5e8a0e63bf7e5874dc3e92f (diff) | |
| parent | 62d0cfcb27cf755cebdc93ca95dabc83608007cd (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/arm/mach-s3c2410/s3c2412-dma.c')
| -rw-r--r-- | arch/arm/mach-s3c2410/s3c2412-dma.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-s3c2410/s3c2412-dma.c b/arch/arm/mach-s3c2410/s3c2412-dma.c index fe71a8fdb87c..138f726ac6bf 100644 --- a/arch/arm/mach-s3c2410/s3c2412-dma.c +++ b/arch/arm/mach-s3c2410/s3c2412-dma.c | |||
| @@ -133,8 +133,8 @@ static struct s3c24xx_dma_map __initdata s3c2412_dma_mappings[] = { | |||
| 133 | static void s3c2412_dma_select(struct s3c2410_dma_chan *chan, | 133 | static void s3c2412_dma_select(struct s3c2410_dma_chan *chan, |
| 134 | struct s3c24xx_dma_map *map) | 134 | struct s3c24xx_dma_map *map) |
| 135 | { | 135 | { |
| 136 | writel(chan->regs + S3C2412_DMA_DMAREQSEL, | 136 | writel(map->channels[0] | S3C2412_DMAREQSEL_HW, |
| 137 | map->channels[0] | S3C2412_DMAREQSEL_HW); | 137 | chan->regs + S3C2412_DMA_DMAREQSEL); |
| 138 | } | 138 | } |
| 139 | 139 | ||
| 140 | static struct s3c24xx_dma_selection __initdata s3c2412_dma_sel = { | 140 | static struct s3c24xx_dma_selection __initdata s3c2412_dma_sel = { |