Merge branch 'iks_for_rmk' of git://git.linaro.org/people/nico/linux into devel-stable

[firefly-linux-kernel-4.4.55.git] / Documentation / mtd / nand_ecc.txt

diff --git a/Documentation/mtd/nand_ecc.txt b/Documentation/mtd/nand_ecc.txt
index 990efd7a9818fd6c93281d852b5f6b20cc60635c..e129b2479ea8def68c74a0cf65c705334814ef7f 100644 (file)
--- a/Documentation/mtd/nand_ecc.txt
+++ b/Documentation/mtd/nand_ecc.txt
@@ -543,7 +543,7 @@ THe code within the for loop was changed to:
     }
 
 As you can see tmppar is used to accumulate the parity within a for
-iteration. In the last 3 statements is is added to par and, if needed,
+iteration. In the last 3 statements is added to par and, if needed,
 to rp12 and rp14.
 
 While making the changes I also found that I could exploit that tmppar