From: luc <luc>
Date: Fri, 29 Jul 2005 20:21:28 +0000 (+0000)
Subject: Make private the nand_scan() function defined in nandemul2k.c.
X-Git-Tag: pre-name-change~452
X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=commitdiff_plain;h=546661e4f2674e56e7ebe84a263fe93b6ff1a2db

Make private the nand_scan() function defined in nandemul2k.c.

It clash with the one from MTD and make it impossible to statically compile this code in the kernel together with MTD (and will also make problems with modules).
---

diff --git a/mtdemul/nandemul2k.c b/mtdemul/nandemul2k.c
index ecc96c8..15213ab 100644
--- a/mtdemul/nandemul2k.c
+++ b/mtdemul/nandemul2k.c
@@ -597,7 +597,7 @@ static void nand_sync (struct mtd_info *mtd)
 /*
  * Scan for the NAND device
  */
-int nand_scan (struct mtd_info *mtd,int nchips)
+static int nandemul2k_scan (struct mtd_info *mtd,int nchips)
 {
 	mtd->oobblock = PAGE_DATA_SIZE;
 	mtd->oobsize =  PAGE_SPARE_SIZE;
@@ -665,7 +665,7 @@ int __init nandemul2k_init (void)
 	
 	CheckInit();
 
-	nand_scan(&nandemul2k_mtd,1);
+	nandemul2k_scan(&nandemul2k_mtd,1);
 
 	// Build the partition table