X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=yportenv_multi.h;h=309b146c10a376e95c479f84440c20d23d38eb85;hp=4dddf63ebb2469f15429cb56f518ec6dbd023a3a;hb=2c8eb2bdc3e753893ecc0dd0cd9cba791d4e16db;hpb=5062df7307f71d3374da87a7c69102dc3f09da28

diff --git a/yportenv_multi.h b/yportenv_multi.h
index 4dddf63..309b146 100644
--- 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,9 +77,9 @@
 #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)
+} while (0)
 
 #ifndef YBUG
 #define YBUG() do {\