---

yaml --- r: 27919 b: refs/heads/master c: f906887 h: refs/heads/master i: 27917: 256d82c 27915: cf1518c 27911: db96e16 27903: b7697a3 v: v3
git-mirror · Jun 9, 2006 · 1a44230 · 1a44230
1 parent e6e42f2
commit 1a44230
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f24ff6bf8c903bc0c645bf87fbe87f9a6d9f634f
+refs/heads/master: f9068876f5ef583f8e9ebf4acd2ef5b35b113db9
diff --git a/trunk/drivers/mtd/nand/s3c2410.c b/trunk/drivers/mtd/nand/s3c2410.c
@@ -256,32 +256,32 @@ static void s3c2410_nand_select_chip(struct mtd_info *mtd, int chip)
 */
 
 static void s3c2410_nand_hwcontrol(struct mtd_info *mtd, int cmd,
-				   unsigend int ctrl)
+				   unsigned int ctrl)
 {
 	struct s3c2410_nand_info *info = s3c2410_nand_mtd_toinfo(mtd);
 	struct nand_chip *chip = mtd->priv;
 
 	if (cmd == NAND_CMD_NONE)
 		return;
 
-	if (cmd & NAND_CLE)
+	if (ctrl & NAND_CLE)
 		writeb(cmd, info->regs + S3C2410_NFCMD);
 	else
 		writeb(cmd, info->regs + S3C2410_NFADDR);
 }
 
 /* command and control functions */
 
-static void s3c2410_nand_hwcontrol(struct mtd_info *mtd, int cmd,
-				   unsigend int ctrl)
+static void s3c2440_nand_hwcontrol(struct mtd_info *mtd, int cmd,
+				   unsigned int ctrl)
 {
 	struct s3c2410_nand_info *info = s3c2410_nand_mtd_toinfo(mtd);
 	struct nand_chip *chip = mtd->priv;
 
 	if (cmd == NAND_CMD_NONE)
 		return;
 
-	if (cmd & NAND_CLE)
+	if (ctrl & NAND_CLE)
 		writeb(cmd, info->regs + S3C2440_NFCMD);
 	else
 		writeb(cmd, info->regs + S3C2440_NFADDR);