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 4dddf63ebb2469f15429cb56f518ec6dbd023a3a..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
@@ -75,7 +77,7 @@
 #endif
 
 #define yaffs_trace(msk, fmt, ...) do { \
-       if(yaffs_trace_mask & ((msk) | YAFFS_TRACE_ALWAYS)) \
+       if(yaffs_trace_mask & (msk)) \
                printk(KERN_DEBUG "yaffs: " fmt "\n", ##__VA_ARGS__); \
 } while(0)