3 files changed, 5 insertions, 5 deletions
diff --git a/uapi/linux/a_debug.h b/uapi/linux/a_debug.h
index 62931060cf08..3a5fd4c2204c 100644
--- a/uapi/linux/a_debug.h
+++ b/uapi/linux/a_debug.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2015 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2013-2016 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -147,7 +147,7 @@ typedef struct _ATH_DEBUG_MODULE_DBG_INFO {
 #define GET_ATH_MODULE_DEBUG_VAR_MASK(s) _XGET_ATH_MODULE_NAME_DEBUG_(s).CurrentMask
 #define _XGET_ATH_MODULE_NAME_DEBUG_(s) debug_ ## s
 
-#ifdef DEBUG
+#ifdef WLAN_DEBUG
 
 /* for source files that will instantiate the debug variables */
 #define ATH_DEBUG_INSTANTIATE_MODULE_VAR(s,name,moddesc,initmask,count,descriptions) \
diff --git a/uapi/linux/debug_linux.h b/uapi/linux/debug_linux.h
index 57c3590efba4..428c90b057f5 100644
--- a/uapi/linux/debug_linux.h
+++ b/uapi/linux/debug_linux.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2015 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2013-2016 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -31,7 +31,7 @@
 /* macro to remove parens */
 #define ATH_PRINTX_ARG(arg ...) arg
 
-#ifdef DEBUG
+#ifdef WLAN_DEBUG
 /* NOTE: the AR_DEBUG_PRINTF macro is defined here to handle special handling of variable arg macros
  * which may be compiler dependent. */
 #define AR_DEBUG_PRINTF(mask, args) do {	\
diff --git a/uapi/linux/osapi_linux.h b/uapi/linux/osapi_linux.h
index 77de5272aac2..4e61a5e21f9e 100644
--- a/uapi/linux/osapi_linux.h
+++ b/uapi/linux/osapi_linux.h
@@ -133,7 +133,7 @@ typedef struct timer_list A_TIMER;
 	 })
 #endif /* wait_event_interruptible_timeout */
 
-#ifdef DEBUG
+#ifdef WLAN_DEBUG
 #ifdef A_SIMOS_DEVHOST
 extern unsigned int panic_on_assert;
 #define A_ASSERT(expr)	\