From: Charles Manning <cdhmanning@gmail.com>
Date: Thu, 25 Nov 2010 23:27:46 +0000 (+1300)
Subject: Merge branch 'master' of ssh://www.aleph1.co.uk/home/aleph1/git/yaffs2
X-Git-Tag: linux-mainline-patchset-4~53
X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=commitdiff_plain;h=9efa67752f0f585c2854c45422f0724df8e38e93;hp=98535c64952cac84919014d44f9fbe9bf7e1c31d

Merge branch 'master' of ssh://aleph1.co.uk/home/aleph1/git/yaffs2
---

diff --git a/direct/timothy_tests/quick_tests/lib.h b/direct/timothy_tests/quick_tests/lib.h
index f24e3aa..09808dd 100644
--- a/direct/timothy_tests/quick_tests/lib.h
+++ b/direct/timothy_tests/quick_tests/lib.h
@@ -20,10 +20,6 @@
 #include <string.h>
 #include "yaffsfs.h"
 
-
-#define ELOOP 10	//the error code ELOOP is not defined yet so I'm making a stand in.
-
-
 #define YAFFS_MOUNT_POINT "/yaffs2/"
 #define FILE_NAME "foo"
 #define FILE_SIZE 10
diff --git a/direct/yportenv.h b/direct/yportenv.h
index 3f368aa..7001150 100644
--- a/direct/yportenv.h
+++ b/direct/yportenv.h
@@ -199,6 +199,10 @@
 #define EISDIR 21
 #endif
 
+#ifndef ELOOP
+#define ELOOP	40
+#endif
+
 
 // Mode flags