diff --git a/drivers/staging/batman-adv/Kconfig b/drivers/staging/batman-adv/Kconfig
index 1d74dabf9511aff4c03c12973deba299762ad232..69e8fb039be0d6872ed156f7376c7fb6509b8567 100644
--- a/drivers/staging/batman-adv/Kconfig
+++ b/drivers/staging/batman-adv/Kconfig
@@ -14,10 +14,10 @@ config BATMAN_ADV
         http://www.open-mesh.org/ for more information and user space
         tools.
 
-config BATMAN_DEBUG
+config BATMAN_ADV_DEBUG
 	bool "B.A.T.M.A.N. debugging"
 	depends on BATMAN_ADV != n
-	help
+	---help---
 
 	  This is an option for use by developers; most people should
 	  say N here. This enables compilation of support for
diff --git a/drivers/staging/batman-adv/README b/drivers/staging/batman-adv/README
index 6c624820edd161bbafd35871e1c596b9381c4db3..a6a419de0b50affe86db879f3932ac62b5c1af99 100644
--- a/drivers/staging/batman-adv/README
+++ b/drivers/staging/batman-adv/README
@@ -115,7 +115,7 @@ kernel, use "make menuconfig" and enable the option
 "B.A.T.M.A.N. debugging". When compiling outside of the kernel tree it
 is necessary to edit the file Makefile.kbuild and uncomment the line
 
-#EXTRA_CFLAGS += -DCONFIG_BATMAN_DEBUG
+#EXTRA_CFLAGS += -DCONFIG_BATMAN_ADV_DEBUG
 
 The additional debug output is by default disabled. It can be enabled
 either at kernel modules load time or during run time. To enable debug
diff --git a/drivers/staging/batman-adv/main.c b/drivers/staging/batman-adv/main.c
index a74bfbeba7c4e1536e77eebcc949f7c139431297..434c600a6a47fb0f0396f0f5da8c41c25c66ddb2 100644
--- a/drivers/staging/batman-adv/main.c
+++ b/drivers/staging/batman-adv/main.c
@@ -57,7 +57,7 @@ atomic_t module_state;
 
 struct workqueue_struct *bat_event_workqueue;
 
-#ifdef CONFIG_BATMAN_DEBUG
+#ifdef CONFIG_BATMAN_ADV_DEBUG
 int debug;
 
 module_param(debug, int, 0644);
diff --git a/drivers/staging/batman-adv/main.h b/drivers/staging/batman-adv/main.h
index 6907cacf8c41ce74e1283e0e0252b237ca025a68..eb6a702c644450e27fbd02fbc73ea2e8431fc4e5 100644
--- a/drivers/staging/batman-adv/main.h
+++ b/drivers/staging/batman-adv/main.h
@@ -76,7 +76,7 @@
 			 * broadcasting / etc */
 #define DBG_ROUTES 2	/* route or hna added / changed / deleted */
 
-#ifdef CONFIG_BATMAN_DEBUG
+#ifdef CONFIG_BATMAN_ADV_DEBUG
 extern int debug;
 
 extern int bat_debug_type(int type);
@@ -85,7 +85,7 @@ extern int bat_debug_type(int type);
 			printk(KERN_DEBUG "batman-adv:" fmt, ## arg);	\
 	}								\
 	while (0)
-#else /* !CONFIG_BATMAN_DEBUG */
+#else /* !CONFIG_BATMAN_ADV_DEBUG */
 #define bat_dbg(type, fmt, arg...) do {		\
 	}					\
 	while (0)