Merge branch 'timothy'

diff --git a/direct/basic-test/dtest.c b/direct/basic-test/dtest.c
index db38cb50fce44e39e25369994098e3170874ade4..691ffe2921842d8b764a4ae584ab21959fc517f3 100644 (file)
--- a/direct/basic-test/dtest.c
+++ b/direct/basic-test/dtest.c
@@ -2691,9 +2691,9 @@ void link_follow_test(const char *mountpt)
        int result;
        int h;
        
-       yaffs_traceMask = 0;
+       yaffs_trace_mask = 0;
 
-       yaffs_StartUp();
+       yaffs_start_up();
 
        yaffs_mount(mountpt);
 

diff --git a/direct/yaffsfs.h b/direct/yaffsfs.h
index e0949593d7281e6742c0b13e9389b4655449c11f..f766c722729d423d7a11a0d5bc215079a1187457 100644 (file)
--- a/direct/yaffsfs.h
+++ b/direct/yaffsfs.h
@@ -170,7 +170,7 @@ struct yaffs_dev_s;
 void yaffs_add_device(struct yaffs_dev_s *dev);
 
 int yaffs_start_up(void);
-
+int yaffsfs_GetLastError(void);
 /* Function to get the last error */
 int yaffs_get_error(void);