| commit | f56d463423b825ff5bf4b63e0dc443557934165c | [log] [tgz] |
|---|---|---|
| author | Kukjin Kim <kgene.kim@samsung.com> | Mon Jan 03 19:36:39 2011 +0900 |
| committer | Kukjin Kim <kgene.kim@samsung.com> | Mon Jan 03 19:36:39 2011 +0900 |
| tree | 722061d8be283d330a8a3c7a6592b40e2b7dedd3 | |
| parent | f651ef6575d8816143afbad4492584979589bd46 [diff] | |
| parent | d03e119c08359f9217154d6a4201689639fe29c8 [diff] |
Merge branch 'next-s3c64xx' into for-next
diff --git a/arch/arm/mach-s3c64xx/dma.c b/arch/arm/mach-s3c64xx/dma.c index e7d03ab..d9aa072 100644 --- a/arch/arm/mach-s3c64xx/dma.c +++ b/arch/arm/mach-s3c64xx/dma.c
@@ -212,6 +212,7 @@ config = readl(chan->regs + PL080S_CH_CONFIG); config |= PL080_CONFIG_ENABLE; + config &= ~PL080_CONFIG_HALT; pr_debug("%s: writing config %08x\n", __func__, config); writel(config, chan->regs + PL080S_CH_CONFIG);