diff mbox

[09/10] staging:batman-adv:correctly name the configuration option for debugging

Message ID 1260389373-1071-10-git-send-email-andrew@lunn.ch
State Accepted, archived
Commit 9274deaa5a53d6369cfb342119902f0d899662f9
Headers show

Commit Message

Andrew Lunn Dec. 9, 2009, 8:09 p.m. UTC
From: marek <marek@45894c77-fb22-0410-b583-ff6e7d5dbf6c>

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>

git-svn-id: http://downloads.open-mesh.net/svn/batman/trunk/batman-adv-kernelland@1491 45894c77-fb22-0410-b583-ff6e7d5dbf6c
---
 Makefile.kbuild |    2 +-
 README          |    2 +-
 main.c          |    2 +-
 main.h          |    4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)
diff mbox

Patch

diff --git a/Makefile.kbuild b/Makefile.kbuild
index cff1185..07e176b 100644
--- a/Makefile.kbuild
+++ b/Makefile.kbuild
@@ -25,7 +25,7 @@  ifeq ($(MAKING_MODULES),1)
 -include $(TOPDIR)/Rules.make
 endif
 
-# EXTRA_CFLAGS += -DCONFIG_BATMAN_DEBUG
+# EXTRA_CFLAGS += -DCONFIG_BATMAN_ADV_DEBUG
 
 ifneq ($(REVISION),)
 EXTRA_CFLAGS += -DREVISION_VERSION=\"r$(REVISION)\"
diff --git a/README b/README
index 6c62482..a6a419d 100644
--- a/README
+++ b/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/main.c b/main.c
index a74bfbe..434c600 100644
--- a/main.c
+++ b/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/main.h b/main.h
index 6907cac..eb6a702 100644
--- a/main.h
+++ b/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)