From 84ba78c01fee6f36e3871a47ddcaa1d7cd6029ea Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 29 Sep 2010 14:57:53 -0700
Subject: [PATCH] --- yaml --- r: 211144 b: refs/heads/master c:
 9d457c60ba783c709c750b851d07f0ac8af78ce9 h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/mtd/nand/omap2.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index a83a52005ae1..223d78431d42 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 90182317a9e383474613aa60e9d61d57bdf17c3e
+refs/heads/master: 9d457c60ba783c709c750b851d07f0ac8af78ce9
diff --git a/trunk/drivers/mtd/nand/omap2.c b/trunk/drivers/mtd/nand/omap2.c
index 133d51528f8d..513e0a76a4a7 100644
--- a/trunk/drivers/mtd/nand/omap2.c
+++ b/trunk/drivers/mtd/nand/omap2.c
@@ -413,7 +413,7 @@ static inline int omap_nand_dma_transfer(struct mtd_info *mtd, void *addr,
 		prefetch_status = gpmc_read_status(GPMC_PREFETCH_COUNT);
 	} while (prefetch_status);
 	/* disable and stop the PFPW engine */
-	gpmc_prefetch_reset();
+	gpmc_prefetch_reset(info->gpmc_cs);
 
 	dma_unmap_single(&info->pdev->dev, dma_addr, len, dir);
 	return 0;