diff -r 30834c0f3179 -r 092bcc217d9d build/common/common.mmh
--- a/build/common/common.mmh	Fri Jul 30 17:38:41 2010 +0100
+++ b/build/common/common.mmh	Sat Jul 31 19:07:57 2010 +0100
@@ -156,9 +156,6 @@
 // extrabtrace
 //
 
-#ifdef FSHELL_CAP_ALL
-#define FSHELL_EXTRABTRACE_SUPPORT
-#endif
 
 #if !defined(FSHELL_TRACE_SUPPORT) && defined(FSHELL_BTRACE_SUPPORT)
 // FSHELL_TRACE_SUPPORT tells you that the BTraceX() functions are available, either via atrace or btrace,
@@ -166,6 +163,10 @@
 #define FSHELL_TRACE_SUPPORT
 #endif
 
+#if defined(FSHELL_TRACE_SUPPORT) && defined(FSHELL_CAP_ALL)
+#define FSHELL_EXTRABTRACE_SUPPORT
+#endif
+
 // The FSHELL_TRACE_xyz macros must appear before any other systeminclude/#include/library statements in your MMP.
 #ifndef FSHELL_TRACE_LIBRARY
 #define FSHELL_D32BTRACE_HEADER <d32btrace.h>