[commits] [linux-merge]linux integration; branch, merge/master, updated. v3.19-rc2-2573-gef4cc0e

postmaster at open-mesh.org postmaster at open-mesh.org
Wed Jan 7 22:15:03 CET 2015


The following commit has been merged in the merge/master branch:
commit ef4cc0ed94eaa44056fa6a4c2bd428b771003323
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>

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
 config BATMAN_ADV_DEBUG
 	bool "B.A.T.M.A.N. debugging"
 	depends on BATMAN_ADV
+	depends on DEBUG_FS
 	help
 	  This is an option for use by developers; most people should
 	  say N here. This enables compilation of support for

-- 
linux integration


More information about the commits mailing list