summaryrefslogtreecommitdiff
path: root/yportenv_multi.h
diff options
context:
space:
mode:
authorCharles Manning <cdhmanning@gmail.com>2011-01-07 14:13:13 +1300
committerCharles Manning <cdhmanning@gmail.com>2011-01-07 14:13:13 +1300
commit6a1296f4458cb8eff1535a8618f45379655e5aa5 (patch)
tree13a8cf978c775cfb5d4796931a2b4c87374d5cb6 /yportenv_multi.h
parente8e45356bea4f0908c6366072a4c4dedd5f33b69 (diff)
yaffs: Fix trace ALWAYS problem and moduleconfig.h dependency
The yaffs trace macro was always tracing. Fixed by no longer forcing ALWAYS on. Only include moduleconfig.h if compiling out of tree. Signed-off-by: Charles Manning <cdhmanning@gmail.com>
Diffstat (limited to 'yportenv_multi.h')
-rw-r--r--yportenv_multi.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/yportenv_multi.h b/yportenv_multi.h
index 4dddf63..10e284e 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,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)