diff --git a/Makefile.kernel b/Makefile.kernel
index 248c213..90db54a 100644
--- a/Makefile.kernel
+++ b/Makefile.kernel
@@ -35,3 +35,7 @@ obj-$(CONFIG_ATHEROS_RATE_SAMPLE)	+= ath_rate/sample/
 obj-$(CONFIG_ATHEROS)			+= ath/ ath_hal/ net80211/
 
 endif
+
+ifeq ($(CONFIG_ATHEROS_DEBUG),y)
+CFLAGS += -DAR_DEBUG -DIEEE80211_DEBUG
+endif
diff --git a/patch-kernel/Kconfig b/patch-kernel/Kconfig
index 3513cb1..62daecb 100644
--- a/patch-kernel/Kconfig
+++ b/patch-kernel/Kconfig
@@ -16,6 +16,13 @@ config ATHEROS
 	  To compile this driver as a module, choose M here: the module will be
 	  called ath_pci.  If unsure, say N.
 
+config ATHEROS_DEBUG
+	bool "Atheros: Debugging support for Atheros PCI/Cardbus cards"
+	depends on ATHEROS
+	default y
+	help
+	  Enable diagnostic checks and log output.
+
 choice
 	prompt "Atheros: Default Transmission Rate Control Algorithm"
 	depends on ATHEROS