diff --git a/[refs] b/[refs] index 8e10e4cfb763..59a49ce0d797 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b06687993c41d0f5658bae6b0bff17c0caae08b6 +refs/heads/master: e75fece2b893c0064b1c79136a60f30326c28eb3 diff --git a/trunk/drivers/staging/batman-adv/Kconfig b/trunk/drivers/staging/batman-adv/Kconfig index 1e7e0a8dbc8b..8553f3517454 100644 --- a/trunk/drivers/staging/batman-adv/Kconfig +++ b/trunk/drivers/staging/batman-adv/Kconfig @@ -4,7 +4,7 @@ config BATMAN_ADV tristate "B.A.T.M.A.N. Advanced Meshing Protocol" - depends on PROC_FS && NET + depends on NET default n ---help---