Merge remote branch 'kumar/merge' into merge

[pandora-kernel.git] / drivers / mtd / nand / diskonchip.c

diff --git a/drivers/mtd/nand/diskonchip.c b/drivers/mtd/nand/diskonchip.c
index b7f8de7..96c0b34 100644 (file)
--- a/drivers/mtd/nand/diskonchip.c
+++ b/drivers/mtd/nand/diskonchip.c
@@ -137,7 +137,7 @@ static struct rs_control *rs_decoder;
  *
  * Fabrice Bellard figured this out in the old docecc code. I added
  * some comments, improved a minor bit and converted it to make use
- * of the generic Reed-Solomon libary. tglx
+ * of the generic Reed-Solomon library. tglx
  */
 static int doc_ecc_decode(struct rs_control *rs, uint8_t *data, uint8_t *ecc)
 {
@@ -400,7 +400,7 @@ static uint16_t __init doc200x_ident_chip(struct mtd_info *mtd, int nr)
        doc200x_hwcontrol(mtd, 0, NAND_CTRL_ALE | NAND_CTRL_CHANGE);
        doc200x_hwcontrol(mtd, NAND_CMD_NONE, NAND_NCE | NAND_CTRL_CHANGE);
 
-       /* We cant' use dev_ready here, but at least we wait for the
+       /* We can't' use dev_ready here, but at least we wait for the
         * command to complete
         */
        udelay(50);
@@ -986,7 +986,7 @@ static int doc200x_correct_data(struct mtd_info *mtd, u_char *dat,
                dummy = ReadDOC(docptr, ECCConf);
        }
 
-       /* Error occured ? */
+       /* Error occurred ? */
        if (dummy & 0x80) {
                for (i = 0; i < 6; i++) {
                        if (DoC_is_MillenniumPlus(doc))
@@ -1160,7 +1160,7 @@ static inline int __init nftl_partscan(struct mtd_info *mtd, struct mtd_partitio
        /* NOTE: The lines below modify internal variables of the NAND and MTD
           layers; variables with have already been configured by nand_scan.
           Unfortunately, we didn't know before this point what these values
-          should be.  Thus, this code is somewhat dependant on the exact
+          should be.  Thus, this code is somewhat dependent on the exact
           implementation of the NAND layer.  */
        if (mh->UnitSizeFactor != 0xff) {
                this->bbt_erase_shift += (0xff - mh->UnitSizeFactor);