From: Timothy Manning <tfhmanning@gmail.com>
Date: Tue, 26 Oct 2010 04:12:06 +0000 (+1300)
Subject: Merge branch 'timothy'
X-Git-Tag: linux-mainline-rc-01~1^2
X-Git-Url: https://yaffs.net/gitweb/?a=commitdiff_plain;h=0f588711ff1dc901d07f79e3f8ca64137da81602;hp=ef24b90a2e00a9a3db2bab70261807037ccc0bd7;p=yaffs2.git

Merge branch 'timothy'
---

diff --git a/direct/basic-test/dtest.c b/direct/basic-test/dtest.c
index db38cb5..691ffe2 100644
--- 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 e094959..f766c72 100644
--- 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);