X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=direct%2Ffsx_test%2Fyaffs_fsx.c;h=31b0751045ca32ff63ca1c6cfa151a50a97b3778;hp=64588c8bc7aa1f6e83a65c7e5bd6fe643504688b;hb=49942b13d7cfbdba72c18de0f37d16d81b4372a8;hpb=9f0dab8f26ae946761792c1b2de425b3232ee6e1

diff --git a/direct/fsx_test/yaffs_fsx.c b/direct/fsx_test/yaffs_fsx.c
index 64588c8..31b0751 100644
--- a/direct/fsx_test/yaffs_fsx.c
+++ b/direct/fsx_test/yaffs_fsx.c
@@ -130,11 +130,7 @@ int	writebdy = 1;			/* -w flag */
 long	monitorstart = -1;		/* -m flag */
 long	monitorend = -1;		/* -m flag */
 int	lite = 0;			/* -L flag */
-<<<<<<< yaffs_fsx.c
-long	numops = 5000;			/* -N flag */
-=======
-long	numops = /*-1 */ 100000;			/* -N flag */
->>>>>>> 1.3
+long	numops = /*-1 */ 10000000;			/* -N flag */
 int	randomoplen = 1;		/* -O flag disables it */
 int	seed = 1;			/* -S flag */
 
@@ -778,7 +774,7 @@ getnum(char *s, char **e)
 }
 
 
-#define BASE_NAME "/flash/yaffs2"
+#define BASE_NAME "/flash/yaffs1"
 
 int
 main(int argc, char **argv)