diff --git a/Kbuild b/Kbuild
index bc43549..a223f8a 100644
--- a/Kbuild
+++ b/Kbuild
@@ -408,6 +408,9 @@
 #Flag to enable HTC credit history feature
 CONFIG_FEATURE_HTC_CREDIT_HISTORY := 1
 
+#Flag to enable MTRACE feature
+CONFIG_TRACE_RECORD_FEATURE := 1
+
 ifeq ($(CONFIG_CFG80211),y)
 HAVE_CFG80211 := 1
 else
@@ -1929,12 +1932,14 @@
 
 ifeq ($(BUILD_DEBUG_VERSION),1)
 CDEFINES +=	-DWLAN_DEBUG \
-		-DTRACE_RECORD \
-		-DLIM_TRACE_RECORD \
-		-DSME_TRACE_RECORD \
-		-DHDD_TRACE_RECORD \
 		-DPE_DEBUG_LOGW \
 		-DPE_DEBUG_LOGE
+ifeq ($(CONFIG_TRACE_RECORD_FEATURE),1)
+CDEFINES +=	-DTRACE_RECORD \
+		-DLIM_TRACE_RECORD \
+		-DSME_TRACE_RECORD \
+		-DHDD_TRACE_RECORD
+endif
 endif
 
 ifeq ($(CONFIG_FEATURE_UNIT_TEST_SUSPEND), 1)