--- a/kernel/eka/include/opensystemtrace.h	Tue Aug 31 16:34:26 2010 +0300
+++ b/kernel/eka/include/opensystemtrace.h	Wed Sep 01 12:34:56 2010 +0100
@@ -19,11 +19,6 @@
 
 #include <opensystemtrace_types.h>
 
-/**
-This macro defines the version of the Open System Trace instrumentation API.
-*/
-#define OST_INSTRUMENTATION_API_VERSION 2.1.0
-
 
 /**
 Methods for tracing from user side.
@@ -122,9 +117,7 @@
 #define OST_TRACE_CATEGORY_NONE 0x00000000
 
 /**
-Preprocessor category for traces that should be compiled
-into all builds including UREL. As a result these traces
-will end up in production images used by consumers.
+Preprocessor category for production traces
 */
 #define OST_TRACE_CATEGORY_PRODUCTION 0x00000001
 
@@ -139,12 +132,6 @@
 #define OST_TRACE_CATEGORY_PERFORMANCE_MEASUREMENT 0x00000004
 
 /**
-Preprocessor category for traces that by default should only 
-be compiled into UDEB builds.
-*/
-#define OST_TRACE_CATEGORY_DEBUG 0x00000008
-
-/**
 Preprocessor level for all traces on.
 This should not be used from traces
 */
@@ -158,24 +145,13 @@
 
 
 /**
-The default preprocessor categories are defined here.
-A component may override this by defining
+The default preprocessor category is RND
+Component may override this by defining
 OST_TRACE_CATEGORY before including this file
-
-The RND category is defined for UREL and UDEB to 
-preserve source compatibility.
 */
-#ifndef OST_TRACE_CATEGORY
-#ifdef _DEBUG
-#define OST_TRACE_CATEGORY (OST_TRACE_CATEGORY_RND | \
-                            OST_TRACE_CATEGORY_PRODUCTION | \
-                            OST_TRACE_CATEGORY_DEBUG)
-#else // _DEBUG
-#define OST_TRACE_CATEGORY (OST_TRACE_CATEGORY_RND | \
-                            OST_TRACE_CATEGORY_PRODUCTION)
-#endif // _DEBUG
-#endif // OST_TRACE_CATEGORY
-
+#if !defined( OST_TRACE_CATEGORY )
+#define OST_TRACE_CATEGORY OST_TRACE_CATEGORY_RND
+#endif
 
 /**
 Trace with no parameters