Take out CONFIG_YAFFS_YAFFS1s for easier build

diff --git a/yaffs_mtdif.c b/yaffs_mtdif.c
index 9f2b3ab7c4c19b4717e07f06c9ddf6a8f4470e40..63f73f02029d27fcd8084e63d2c7f62d662a6d91 100644 (file)
--- a/yaffs_mtdif.c
+++ b/yaffs_mtdif.c
@@ -14,11 +14,10 @@
  */
 
 const char *yaffs_mtdif_c_version =
-    "$Id: yaffs_mtdif.c,v 1.10 2005-08-11 01:07:43 marty Exp $";
+    "$Id: yaffs_mtdif.c,v 1.11 2005-09-20 05:23:41 charles Exp $";
 
 #include "yportenv.h"
 
-#ifdef CONFIG_YAFFS_YAFFS1
 
 #include "yaffs_mtdif.h"
 
@@ -155,4 +154,3 @@ int nandmtd_InitialiseNAND(yaffs_Device * dev)
        return YAFFS_OK;
 }
 
-#endif /* CONFIG_YAFFS_YAFFS1 */

diff --git a/yaffs_mtdif2.c b/yaffs_mtdif2.c
index 0dfb942e39100698f5f510d85dadf1c7476931c2..ee46296964bb47f1cc0ba509d3584eaeb5f55c92 100644 (file)
--- a/yaffs_mtdif2.c
+++ b/yaffs_mtdif2.c
@@ -16,11 +16,10 @@
 /* mtd interface for YAFFS2 */
 
 const char *yaffs_mtdif2_c_version =
-    "$Id: yaffs_mtdif2.c,v 1.7 2005-08-11 01:07:43 marty Exp $";
+    "$Id: yaffs_mtdif2.c,v 1.8 2005-09-20 05:23:41 charles Exp $";
 
 #include "yportenv.h"
 
-#ifdef CONFIG_YAFFS_YAFFS1
 
 #include "yaffs_mtdif2.h"
 
@@ -190,4 +189,3 @@ int nandmtd2_QueryNANDBlock(struct yaffs_DeviceStruct *dev, int blockNo,
                return YAFFS_FAIL;
 }
 
-#endif