[Yaffs] [PATCH YAFFS2 10/15] make-private-nandemul2k-nand_sc…

Top Page
Attachments:
Message as email
+ (text/plain)
+ 10-make-private-nandemul2k-nand_scan.diff (text/plain)
Delete this message
Reply to this message
Author: Luc Van Oostenryck
Date:  
To: yaffs
Old-Topics: [Yaffs] [PATCH YAFFS2 0/15] Pending patches.
Subject: [Yaffs] [PATCH YAFFS2 10/15] make-private-nandemul2k-nand_scan
Make private the nand_scan() function defined in nandemul2k.c, it clash with the one from MTD.




-- Luc Van Oostenryck
diff --git a/fs/yaffs2/mtdemul/nandemul2k.c b/fs/yaffs2/mtdemul/nandemul2k.c
--- a/fs/yaffs2/mtdemul/nandemul2k.c
+++ b/fs/yaffs2/mtdemul/nandemul2k.c
@@ -597,7 +597,7 @@ static void nand_sync (struct mtd_info *
 /*
  * 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;
@@ -667,7 +667,7 @@ int __init nandemul2k_init (void)

    
     CheckInit();


-    nand_scan(&nandemul2k_mtd,1);
+    nandemul2k_scan(&nandemul2k_mtd,1);


     // Build the partition table