The following commit has been merged in the master branch: commit 10e3cd6a251a2a24e5461e5ad242ea8708ff1866 Author: Antonio Quartulli ordex@autistici.org Date: Sat Mar 31 16:10:33 2012 +0300

batman-adv: clean up Kconfig

Signed-off-by: Antonio Quartulli ordex@autistici.org

diff --git a/net/batman-adv/Kconfig b/net/batman-adv/Kconfig index 2b68d06..a04d28f 100644 --- a/net/batman-adv/Kconfig +++ b/net/batman-adv/Kconfig @@ -7,19 +7,18 @@ config BATMAN_ADV depends on NET select CRC16 default n - ---help--- + help + B.A.T.M.A.N. (better approach to mobile ad-hoc networking) is + a routing protocol for multi-hop ad-hoc mesh networks. The + networks may be wired or wireless. See + http://www.open-mesh.org/ for more information and user space + tools.

- B.A.T.M.A.N. (better approach to mobile ad-hoc networking) is - a routing protocol for multi-hop ad-hoc mesh networks. The - networks may be wired or wireless. See - http://www.open-mesh.org/ for more information and user space - tools.

config BATMAN_ADV_DEBUG bool "B.A.T.M.A.N. debugging" - depends on BATMAN_ADV != n - ---help--- - + depends on BATMAN_ADV + help This is an option for use by developers; most people should say N here. This enables compilation of support for outputting debugging information to the kernel log. The