diff -urNp -X linux-2.6-bjd2/Documentation/dontdiff linux-2.6-bjd2/drivers/mtd/nand/s3c2410.c linux-2.6-bjd3/drivers/mtd/nand/s3c2410.c
--- linux-2.6-bjd2/drivers/mtd/nand/s3c2410.c	2006-06-19 09:24:03.000000000 +0100
+++ linux-2.6-bjd3/drivers/mtd/nand/s3c2410.c	2006-06-19 09:27:14.000000000 +0100
@@ -268,20 +268,16 @@ static void s3c2410_nand_select_chip(str
 		clk_disable(info->clk);
 }
 
-/* command and control functions
- *
- * Note, these all use tglx's method of changing the IO_ADDR_W field
- * to make the code simpler, and use the nand layer's code to issue the
- * command and address sequences via the proper IO ports.
+/* s3c2410_nand_hwcontrol
  *
+ * Issue command and address cycles to the chip
 */
 
 static void s3c2410_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;
 
@@ -297,7 +293,6 @@ static void s3c2440_nand_hwcontrol(struc
 				   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;