From 1a44230befc79b5d77984b5cf7c3a47fa34bd71d Mon Sep 17 00:00:00 2001
From: David Woodhouse <dwmw2@infradead.org>
Date: Sat, 10 Jun 2006 00:53:16 +0100
Subject: [PATCH] --- yaml --- r: 27919 b: refs/heads/master c:
 f9068876f5ef583f8e9ebf4acd2ef5b35b113db9 h: refs/heads/master i:   27917:
 256d82c443869dcf28adf243fa23b48b6da5b5a1   27915:
 cf1518c00eb29beed9c62eef84ab5d7cda0c76c9   27911:
 db96e16b004227c3fc99d67d216bc02d5d41ef4b   27903:
 b7697a3d0268bf0863d910d45478064061c8954c v: v3

---
 [refs]                           |  2 +-
 trunk/drivers/mtd/nand/s3c2410.c | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 58aaa9451c1e..4a7c99c8eb22 100644
--- 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
index 8429793a6288..d6365a668874 100644
--- a/trunk/drivers/mtd/nand/s3c2410.c
+++ b/trunk/drivers/mtd/nand/s3c2410.c
@@ -256,7 +256,7 @@ 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;
@@ -264,7 +264,7 @@ static void s3c2410_nand_hwcontrol(struct mtd_info *mtd, int cmd,
 	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);
@@ -272,8 +272,8 @@ static void s3c2410_nand_hwcontrol(struct mtd_info *mtd, int cmd,
 
 /* 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;
@@ -281,7 +281,7 @@ static void s3c2410_nand_hwcontrol(struct mtd_info *mtd, int cmd,
 	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);