diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2009-09-09 02:42:29 +0200 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2009-09-09 02:42:29 +0200 |
| commit | f9dd2134374c8de6b911e2b8652c6c9622eaa658 (patch) | |
| tree | c1b8f8d622941606b9e7247ab31d811ba4295011 /arch/arm/plat-iop | |
| parent | net_dma: poll for a descriptor after allocation failure (diff) | |
| parent | md/raid456: distribute raid processing over multiple cores (diff) | |
| download | linux-f9dd2134374c8de6b911e2b8652c6c9622eaa658.tar.xz linux-f9dd2134374c8de6b911e2b8652c6c9622eaa658.zip | |
Merge branch 'md-raid6-accel' into ioat3.2
Conflicts:
include/linux/dmaengine.h
Diffstat (limited to 'arch/arm/plat-iop')
| -rw-r--r-- | arch/arm/plat-iop/adma.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-iop/adma.c b/arch/arm/plat-iop/adma.c index 3c127aabe214..da1dd0dab07c 100644 --- a/arch/arm/plat-iop/adma.c +++ b/arch/arm/plat-iop/adma.c @@ -198,7 +198,7 @@ static int __init iop3xx_adma_cap_init(void) dma_cap_set(DMA_INTERRUPT, iop3xx_aau_data.cap_mask); #else dma_cap_set(DMA_XOR, iop3xx_aau_data.cap_mask); - dma_cap_set(DMA_ZERO_SUM, iop3xx_aau_data.cap_mask); + dma_cap_set(DMA_XOR_VAL, iop3xx_aau_data.cap_mask); dma_cap_set(DMA_MEMSET, iop3xx_aau_data.cap_mask); dma_cap_set(DMA_INTERRUPT, iop3xx_aau_data.cap_mask); #endif |