X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=mtdemul%2Fnandemul2k.c;h=e5217b054ff4c758ec26a334c5f6f86c5e1c8214;hp=ecc96c8e7900ae6aa0fc180debf7694eb956d74e;hb=1c4056c8ab9d9a090280567b2249f4bdd3412454;hpb=412a849e17d81802a45dbed775a6461c8c3a72c7

diff --git a/mtdemul/nandemul2k.c b/mtdemul/nandemul2k.c
index ecc96c8..e5217b0 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;
@@ -630,6 +630,8 @@ int nand_scan (struct mtd_info *mtd,int nchips)
 	mtd->suspend = NULL;
 	mtd->resume = NULL;
 
+	mtd->name = "NANDemul2k";
+
 	/* Return happy */
 	return 0;
 }
@@ -648,9 +650,9 @@ __setup("sizeInMB=",sizeInMB);
 
 static struct mtd_partition nandemul2k_partition[] =
 {
-	{ name: "NANDemul partition 1",
-	  offset:  0,
-	  size: 0 },
+	{ .name		= "NANDemul partition 1",
+	  .offset	= 0,
+	  .size		= 0 },
 };
 
 static int nPartitions = sizeof(nandemul2k_partition)/sizeof(nandemul2k_partition[0]);
@@ -665,7 +667,7 @@ int __init nandemul2k_init (void)
 	
 	CheckInit();
 
-	nand_scan(&nandemul2k_mtd,1);
+	nandemul2k_scan(&nandemul2k_mtd,1);
 
 	// Build the partition table