X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=yaffs_mtdif.c;h=13df3d98a8faa7bd4b71b641606f6b445e994786;hp=2dfc7058c619307cd92aa79f0c68843e8f2f9b91;hb=c898fad8c0b581688b4ebd9d7952c909379d6df7;hpb=37fd9ec3587b5c4d497a7682522a9adfab682e51

diff --git a/yaffs_mtdif.c b/yaffs_mtdif.c
index 2dfc705..13df3d9 100644
--- a/yaffs_mtdif.c
+++ b/yaffs_mtdif.c
@@ -13,12 +13,12 @@
  *
  */
 
-const char *yaffs_mtdif_c_version = "$Id: yaffs_mtdif.c,v 1.1 2004-12-17 04:39:04 charles Exp $";
-
-#ifdef CONFIG_YAFFS_MTD_ENABLED
+const char *yaffs_mtdif_c_version = "$Id: yaffs_mtdif.c,v 1.6 2005-07-31 08:38:41 marty Exp $";
  
 #include "yportenv.h"
 
+#ifdef CONFIG_YAFFS_YAFFS1
+
 #include "yaffs_mtdif.h"
 
 #include "linux/mtd/mtd.h"
@@ -29,17 +29,17 @@ const char *yaffs_mtdif_c_version = "$Id: yaffs_mtdif.c,v 1.1 2004-12-17 04:39:0
 #include "linux/mtd/nand.h"
 #endif
 
-struct nand_oobinfo yaffs_oobinfo = {
-	useecc: 1,
-	eccpos: {8, 9, 10, 13, 14, 15}
+static struct nand_oobinfo yaffs_oobinfo = {
+	.useecc = 1,
+	.eccpos = {8, 9, 10, 13, 14, 15}
 };
 
-struct nand_oobinfo yaffs_noeccinfo = {
-	useecc: 0,
+static struct nand_oobinfo yaffs_noeccinfo = {
+	.useecc = 0,
 };
 
 
-int nandmtd_WriteChunkToNAND(yaffs_Device *dev,int chunkInNAND,const __u8 *data, yaffs_Spare *spare)
+int nandmtd_WriteChunkToNAND(yaffs_Device *dev,int chunkInNAND,const __u8 *data, const yaffs_Spare *spare)
 {
 	struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
 	size_t dummy;
@@ -159,5 +159,5 @@ int nandmtd_InitialiseNAND(yaffs_Device *dev)
 	return YAFFS_OK;
 }
 
-#endif // CONFIG_YAFFS_MTD_ENABLED
+#endif // CONFIG_YAFFS_YAFFS1