diff --git a/Kbuild b/Kbuild
index a79458a..a130f62 100644
--- a/Kbuild
+++ b/Kbuild
@@ -418,6 +418,9 @@
 #Flag to enable MTRACE feature
 CONFIG_TRACE_RECORD_FEATURE := 1
 
+#Flag to enable p2p debug feature
+CONFIG_WLAN_FEATURE_P2P_DEBUG := 1
+
 ifeq ($(CONFIG_CFG80211),y)
 HAVE_CFG80211 := 1
 else
@@ -1832,7 +1835,6 @@
 		-DWLAN_AP_STA_CONCURRENCY \
 		-DFEATURE_WLAN_SCAN_PNO \
 		-DWLAN_FEATURE_PACKET_FILTERING \
-		-DWLAN_FEATURE_P2P_DEBUG \
 		-DWLAN_ENABLE_AGEIE_ON_SCAN_RESULTS \
 		-DWLANTL_DEBUG\
 		-DWLAN_NS_OFFLOAD \
@@ -1878,6 +1880,10 @@
 CDEFINES += -DFEATURE_HTC_CREDIT_HISTORY
 endif
 
+ifeq ($(CONFIG_WLAN_FEATURE_P2P_DEBUG), 1)
+CDEFINES += -DWLAN_FEATURE_P2P_DEBUG
+endif
+
 ifneq ($(CONFIG_HIF_USB), 1)
 CDEFINES += -DWLAN_LOGGING_SOCK_SVC_ENABLE
 endif