Merge branch 'iop-raid6' into async-tx-next

[pandora-kernel.git] / drivers / dma / iop-adma.c

diff --git a/drivers/dma/iop-adma.c b/drivers/dma/iop-adma.c
index f4c59e5..518f557 100644 (file)
--- a/drivers/dma/iop-adma.c
+++ b/drivers/dma/iop-adma.c
@@ -1605,15 +1605,12 @@ static int __devinit iop_adma_probe(struct platform_device *pdev)
        }
 
        dev_printk(KERN_INFO, &pdev->dev, "Intel(R) IOP: "
        }
 
        dev_printk(KERN_INFO, &pdev->dev, "Intel(R) IOP: "

-         "( %s%s%s%s%s%s%s%s%s%s)\n",
+         "( %s%s%s%s%s%s%s)\n",

          dma_has_cap(DMA_PQ, dma_dev->cap_mask) ? "pq " : "",
          dma_has_cap(DMA_PQ, dma_dev->cap_mask) ? "pq " : "",

-         dma_has_cap(DMA_PQ_UPDATE, dma_dev->cap_mask) ? "pq_update " : "",

          dma_has_cap(DMA_PQ_VAL, dma_dev->cap_mask) ? "pq_val " : "",
          dma_has_cap(DMA_XOR, dma_dev->cap_mask) ? "xor " : "",
          dma_has_cap(DMA_PQ_VAL, dma_dev->cap_mask) ? "pq_val " : "",
          dma_has_cap(DMA_XOR, dma_dev->cap_mask) ? "xor " : "",

-         dma_has_cap(DMA_DUAL_XOR, dma_dev->cap_mask) ? "dual_xor " : "",

          dma_has_cap(DMA_XOR_VAL, dma_dev->cap_mask) ? "xor_val " : "",
          dma_has_cap(DMA_MEMSET, dma_dev->cap_mask)  ? "fill " : "",
          dma_has_cap(DMA_XOR_VAL, dma_dev->cap_mask) ? "xor_val " : "",
          dma_has_cap(DMA_MEMSET, dma_dev->cap_mask)  ? "fill " : "",

-         dma_has_cap(DMA_MEMCPY_CRC32C, dma_dev->cap_mask) ? "cpy+crc " : "",

          dma_has_cap(DMA_MEMCPY, dma_dev->cap_mask) ? "cpy " : "",
          dma_has_cap(DMA_INTERRUPT, dma_dev->cap_mask) ? "intr " : "");
 
          dma_has_cap(DMA_MEMCPY, dma_dev->cap_mask) ? "cpy " : "",
          dma_has_cap(DMA_INTERRUPT, dma_dev->cap_mask) ? "intr " : "");