diff --git a/[refs] b/[refs]
index ac3ebca6e6ba..ac644e2baad6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0f4974c439dd7826c85bae4e6a8088ce2db0f498
+refs/heads/master: cb5228a6949f525dba37d4eb3ee114426fef22c9
diff --git a/trunk/drivers/staging/batman-adv/Kconfig b/trunk/drivers/staging/batman-adv/Kconfig
index b9742e7c7d9e..7632f5760060 100644
--- a/trunk/drivers/staging/batman-adv/Kconfig
+++ b/trunk/drivers/staging/batman-adv/Kconfig
@@ -15,7 +15,7 @@ config BATMAN_ADV
 
 config BATMAN_DEBUG
 	bool "B.A.T.M.A.N. debugging"
-	depends on BATMAN != n
+	depends on BATMAN_ADV != n
 	help
 
 	  This is an option for use by developers; most people should