From d1d322644d3a2daf7b60967465b8a11e808278cd Mon Sep 17 00:00:00 2001 From: Nicolas Ferre Date: Wed, 29 Jun 2011 18:41:16 +0200 Subject: [PATCH] --- yaml --- r: 274899 b: refs/heads/master c: 201ab536ac205a2787f8eac2eedc697616f99e04 h: refs/heads/master i: 274897: c5dbbd6ef73ab00e485c0d9e03a1c6d0cc1718e0 274895: dcdf6d5cb01e557281aa7fa68079f1116470a9b0 v: v3 --- [refs] | 2 +- trunk/drivers/mtd/nand/atmel_nand.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index bc3ff2363d54..17c46fdbfc0f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 08c248fbe2bfc0326255c5b0cb3952166234d59b +refs/heads/master: 201ab536ac205a2787f8eac2eedc697616f99e04 diff --git a/trunk/drivers/mtd/nand/atmel_nand.c b/trunk/drivers/mtd/nand/atmel_nand.c index b1381437a957..ee6e26e78a1a 100644 --- a/trunk/drivers/mtd/nand/atmel_nand.c +++ b/trunk/drivers/mtd/nand/atmel_nand.c @@ -588,7 +588,7 @@ static int __init atmel_nand_probe(struct platform_device *pdev) dma_cap_zero(mask); dma_cap_set(DMA_MEMCPY, mask); - host->dma_chan = dma_request_channel(mask, 0, NULL); + host->dma_chan = dma_request_channel(mask, NULL, NULL); if (!host->dma_chan) { dev_err(host->dev, "Failed to request DMA channel\n"); use_dma = 0;