Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...

[~andy/linux] / drivers / mtd / nand / mxc_nand.c

diff --git a/drivers/mtd/nand/mxc_nand.c b/drivers/mtd/nand/mxc_nand.c
index b7d5a5b9a5434f8ee1d7b0ab7b686aa052f17954..42a95fb415047d37ed15e7b1df5a989cbd9af017 100644 (file)
--- a/drivers/mtd/nand/mxc_nand.c
+++ b/drivers/mtd/nand/mxc_nand.c
@@ -747,9 +747,8 @@ static void mxc_do_addr_cycle(struct mtd_info *mtd, int column, int page_addr)
                /*
                 * MXC NANDFC can only perform full page+spare or
                 * spare-only read/write.  When the upper layers
-                * layers perform a read/write buf operation,
-                * we will used the saved column address to index into
-                * the full page.
+                * perform a read/write buf operation, the saved column
+                 * address is used to index into the full page.
                 */
                host->send_addr(host, 0, page_addr == -1);
                if (mtd->writesize > 512)