From 357806658d4e59f408fe30b0e1a398eef983ab69 Mon Sep 17 00:00:00 2001 From: Wei Yongquan Date: Wed, 29 Dec 2010 20:30:55 +0800 Subject: [PATCH] --- yaml --- r: 231624 b: refs/heads/master c: 0261f7416362f6affc2d4fe7fea9320a6bdaaee6 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/dma/iop-adma.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 7673888c3154..1948c4e7b1f0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 96a608a4bfd8468c21881b3f92024923886eb015 +refs/heads/master: 0261f7416362f6affc2d4fe7fea9320a6bdaaee6 diff --git a/trunk/drivers/dma/iop-adma.c b/trunk/drivers/dma/iop-adma.c index 161c452923b8..c6b01f535b29 100644 --- a/trunk/drivers/dma/iop-adma.c +++ b/trunk/drivers/dma/iop-adma.c @@ -1261,7 +1261,7 @@ iop_adma_xor_val_self_test(struct iop_adma_device *device) return err; } -#ifdef CONFIG_MD_RAID6_PQ +#ifdef CONFIG_RAID6_PQ static int __devinit iop_adma_pq_zero_sum_self_test(struct iop_adma_device *device) { @@ -1584,7 +1584,7 @@ static int __devinit iop_adma_probe(struct platform_device *pdev) if (dma_has_cap(DMA_PQ, dma_dev->cap_mask) && dma_has_cap(DMA_PQ_VAL, dma_dev->cap_mask)) { - #ifdef CONFIG_MD_RAID6_PQ + #ifdef CONFIG_RAID6_PQ ret = iop_adma_pq_zero_sum_self_test(adev); dev_dbg(&pdev->dev, "pq self test returned %d\n", ret); #else