yaffs: Fix trace ALWAYS problem and moduleconfig.h dependency

[yaffs2.git] / yportenv_multi.h

diff --git a/yportenv_multi.h b/yportenv_multi.h
index e53679664bec95bf2dda43f2807e044ff0b3ed8d..10e284e8ec7b4e0271f5837f18ef04ef9973f862 100644 (file)
--- a/yportenv_multi.h
+++ b/yportenv_multi.h
@@ -24,7 +24,9 @@
 
 #define MTD_VERSION(a, b, c) (((a) << 16) + ((b) << 8) + (c))
 
+#ifdef YAFFS_OUT_OF_TREE
 #include "moduleconfig.h"
+#endif
 
 #include <linux/version.h>
 #define MTD_VERSION_CODE LINUX_VERSION_CODE
@@ -51,13 +53,6 @@
 #define YUCHAR unsigned char
 #define _Y(x)     x
 
-#define Y_INLINE __inline__
-
-#define yaffs_trace(msk, fmt, ...) do { \
-       if(yaffs_trace_mask & ((msk) | YAFFS_TRACE_ALWAYS)) \
-               printk(KERN_DEBUG "yaffs: " fmt "\n", ##__VA_ARGS__); \
-} while(0)
-
 #define YAFFS_LOSTNFOUND_NAME          "lost+found"
 #define YAFFS_LOSTNFOUND_PREFIX                "obj"
 
@@ -81,6 +76,11 @@
 #define Y_DUMP_STACK() dump_stack()
 #endif
 
+#define yaffs_trace(msk, fmt, ...) do { \
+       if(yaffs_trace_mask & (msk)) \
+               printk(KERN_DEBUG "yaffs: " fmt "\n", ##__VA_ARGS__); \
+} while(0)
+
 #ifndef YBUG
 #define YBUG() do {\
        yaffs_trace(YAFFS_TRACE_BUG,\