diff --git a/Makefile b/Makefile
index 5871191..7ddc63e 100755
--- a/Makefile
+++ b/Makefile
@@ -150,6 +150,11 @@ ifeq ($(CONFIG_PCI_HCI), y)
 HCI_NAME = pci
 endif
 
+ifeq ($(DEBUG), 1)
+EXTRA_CFLAGS += -DDBG=1 -DCONFIG_DEBUG
+else
+EXTRA_CFLAGS += -DDBG=0
+endif
 
 _OS_INTFS_FILES :=	os_dep/osdep_service.o \
 			os_dep/linux/os_intfs.o \
diff --git a/include/autoconf.h b/include/autoconf.h
index fe69881..37615cb 100644
--- a/include/autoconf.h
+++ b/include/autoconf.h
@@ -344,9 +344,9 @@
 /*
  * Debug Related Config
  */
-#define DBG	1
+//#define DBG	1
 
-#define CONFIG_DEBUG /* DBG_871X, etc... */
+//#define CONFIG_DEBUG /* DBG_871X, etc... */
 //#define CONFIG_DEBUG_RTL871X /* RT_TRACE, RT_PRINT_DATA, _func_enter_, _func_exit_ */
 
 #define CONFIG_PROC_DEBUG