From 746d31c32cdebafc0cc03e854052d37d221e6eee Mon Sep 17 00:00:00 2001 From: Ben Dooks Date: Mon, 29 Jan 2007 00:11:29 +0100 Subject: [PATCH] --- yaml --- r: 45931 b: refs/heads/master c: b9d1902cd281d9b829fb3d6ee9148d28c8c63382 h: refs/heads/master i: 45929: eecfa8cdde4cc840e39eacac3ff4b0a9efe0931d 45927: a0d8ff1d0ecda29ff9c9973736c056d42e1019bc v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-s3c2410/s3c2412-dma.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 46a655218a3e..4c1345f5a7e6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c6428464894889e110418928e6b37dc2eb4cee56 +refs/heads/master: b9d1902cd281d9b829fb3d6ee9148d28c8c63382 diff --git a/trunk/arch/arm/mach-s3c2410/s3c2412-dma.c b/trunk/arch/arm/mach-s3c2410/s3c2412-dma.c index fe71a8fdb87c..138f726ac6bf 100644 --- a/trunk/arch/arm/mach-s3c2410/s3c2412-dma.c +++ b/trunk/arch/arm/mach-s3c2410/s3c2412-dma.c @@ -133,8 +133,8 @@ static struct s3c24xx_dma_map __initdata s3c2412_dma_mappings[] = { static void s3c2412_dma_select(struct s3c2410_dma_chan *chan, struct s3c24xx_dma_map *map) { - writel(chan->regs + S3C2412_DMA_DMAREQSEL, - map->channels[0] | S3C2412_DMAREQSEL_HW); + writel(map->channels[0] | S3C2412_DMAREQSEL_HW, + chan->regs + S3C2412_DMA_DMAREQSEL); } static struct s3c24xx_dma_selection __initdata s3c2412_dma_sel = {