diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2012-11-21 14:38:13 +0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2012-11-21 14:38:13 +0400 |
| commit | 851462444d421c223965b12b836bef63da61b57f (patch) | |
| tree | 495baa14e638817941496c36e1443aed7dae0ea0 /arch/arm/mach-exynos/dma.c | |
| parent | 5a6ea4af0907f995dc06df21a9c9ef764c7cd3bc (diff) | |
| parent | 6924d99fcdf1a688538a3cdebd1f135c22eec191 (diff) | |
| download | linux-851462444d421c223965b12b836bef63da61b57f.tar.xz | |
Merge branch 'for-3.7' of git://git.infradead.org/users/dedekind/l2-mtd
Conflicts:
drivers/mtd/nand/nand_base.c
Diffstat (limited to 'arch/arm/mach-exynos/dma.c')
| -rw-r--r-- | arch/arm/mach-exynos/dma.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-exynos/dma.c b/arch/arm/mach-exynos/dma.c index f60b66dbcf84..21d568b3b149 100644 --- a/arch/arm/mach-exynos/dma.c +++ b/arch/arm/mach-exynos/dma.c @@ -303,10 +303,12 @@ static int __init exynos_dma_init(void) dma_cap_set(DMA_SLAVE, exynos_pdma0_pdata.cap_mask); dma_cap_set(DMA_CYCLIC, exynos_pdma0_pdata.cap_mask); + dma_cap_set(DMA_PRIVATE, exynos_pdma0_pdata.cap_mask); amba_device_register(&exynos_pdma0_device, &iomem_resource); dma_cap_set(DMA_SLAVE, exynos_pdma1_pdata.cap_mask); dma_cap_set(DMA_CYCLIC, exynos_pdma1_pdata.cap_mask); + dma_cap_set(DMA_PRIVATE, exynos_pdma1_pdata.cap_mask); amba_device_register(&exynos_pdma1_device, &iomem_resource); dma_cap_set(DMA_MEMCPY, exynos_mdma1_pdata.cap_mask); |