diff options
| author | Colin Cross <ccross@android.com> | 2010-10-15 12:03:22 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2010-10-15 12:03:22 -0700 |
| commit | 89c37cce1c850fe046df50ccb923a8eccbf259b6 (patch) | |
| tree | 214c7beca34ca9fd72493001121599291ea1300d /drivers/mtd | |
| parent | 43ca7cdda2e511be7d19c3bdbc437e471b7e8f7e (diff) | |
| parent | cd07202cc8262e1669edff0d97715f3dd9260917 (diff) | |
Merge commit 'v2.6.36-rc8' into linux-tegra-2.6.36
Diffstat (limited to 'drivers/mtd')
| -rw-r--r-- | drivers/mtd/nand/omap2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/nand/omap2.c b/drivers/mtd/nand/omap2.c index 133d51528f8d..513e0a76a4a7 100644 --- a/drivers/mtd/nand/omap2.c +++ b/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; |