commit 9d457c60ba783c709c750b851d07f0ac8af78ce9
author Linus Torvalds <torvalds@linux-foundation.org> Wed Sep 29 14:57:53 2010 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Wed Sep 29 14:57:53 2010 -0700
tree 9e28956058607759b3ef63c0fb6fc9a0e3d9a810
parent f12f662f29d5801e598c6bb4a71e54b2de218f72
parent 90182317a9e383474613aa60e9d61d57bdf17c3e

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6:
  mfd: Fix max8925 irq control bit incorrect setting
  mfd: Ignore non-GPIO IRQs when setting wm831x IRQ types

drivers/mtd/nand/omap2.c

diff --git a/drivers/mtd/nand/omap2.c b/drivers/mtd/nand/omap2.c
index 133d515..513e0a7 100644
--- a/drivers/mtd/nand/omap2.c
+++ b/drivers/mtd/nand/omap2.c
@@ -413,7 +413,7 @@
 		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;