diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2009-09-08 20:42:29 -0400 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2009-09-08 20:42:29 -0400 |
| commit | f9dd2134374c8de6b911e2b8652c6c9622eaa658 (patch) | |
| tree | c1b8f8d622941606b9e7247ab31d811ba4295011 /arch/arm/plat-iop/adma.c | |
| parent | 4b652f0db3be891c7b76b109c3b55003b920fc96 (diff) | |
| parent | 07a3b417dc3d00802bd7b4874c3e811f0b015a7d (diff) | |
Merge branch 'md-raid6-accel' into ioat3.2
Conflicts:
include/linux/dmaengine.h
Diffstat (limited to 'arch/arm/plat-iop/adma.c')
| -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) | |||
| 198 | dma_cap_set(DMA_INTERRUPT, iop3xx_aau_data.cap_mask); | 198 | dma_cap_set(DMA_INTERRUPT, iop3xx_aau_data.cap_mask); |
| 199 | #else | 199 | #else |
| 200 | dma_cap_set(DMA_XOR, iop3xx_aau_data.cap_mask); | 200 | dma_cap_set(DMA_XOR, iop3xx_aau_data.cap_mask); |
| 201 | dma_cap_set(DMA_ZERO_SUM, iop3xx_aau_data.cap_mask); | 201 | dma_cap_set(DMA_XOR_VAL, iop3xx_aau_data.cap_mask); |
| 202 | dma_cap_set(DMA_MEMSET, iop3xx_aau_data.cap_mask); | 202 | dma_cap_set(DMA_MEMSET, iop3xx_aau_data.cap_mask); |
| 203 | dma_cap_set(DMA_INTERRUPT, iop3xx_aau_data.cap_mask); | 203 | dma_cap_set(DMA_INTERRUPT, iop3xx_aau_data.cap_mask); |
| 204 | #endif | 204 | #endif |