[linux-next] LinuxNextTracking branch, master, updated. next-20150112

batman at open-mesh.org batman at open-mesh.org
Tue Jan 13 00:24:21 CET 2015

The following commit has been merged in the master branch:
commit 9535395640edb23ba5cec2abb026c4ee51899722
Author: Markus Pargmann <mpa at pengutronix.de>
Date:   Sat Nov 29 19:07:46 2014 +0100

    batman-adv: Kconfig, Add missing DEBUG_FS dependency
    BATMAN_ADV_DEBUG is using debugfs files for the debugging log. So it
    depends on DEBUG_FS which is missing as dependency in the Kconfig file.
    Signed-off-by: Markus Pargmann <mpa at pengutronix.de>
    Signed-off-by: Antonio Quartulli <antonio at meshcoding.com>

diff --git a/net/batman-adv/Kconfig b/net/batman-adv/Kconfig
index 11660a3..c6fc8f7 100644
--- a/net/batman-adv/Kconfig
+++ b/net/batman-adv/Kconfig
@@ -62,6 +62,7 @@ config BATMAN_ADV_MCAST
 	bool "B.A.T.M.A.N. debugging"
 	depends on BATMAN_ADV
+	depends on DEBUG_FS
 	  This is an option for use by developers; most people should
 	  say N here. This enables compilation of support for


More information about the linux-merge mailing list