The following commit has been merged in the linux branch: commit 8fd599c316c75a4025aa2ea1c198dec082abeec0 Author: Andrew Lunn andrew@lunn.ch Date: Sat Dec 5 11:27:17 2009 +0100

Fix the naming of the debug option in Kconfig.

diff --git a/drivers/staging/batman-adv/Kconfig b/drivers/staging/batman-adv/Kconfig index b9742e7..698eb31 100644 --- a/drivers/staging/batman-adv/Kconfig +++ b/drivers/staging/batman-adv/Kconfig @@ -13,10 +13,10 @@ config BATMAN_ADV http://www.open-mesh.org/ for more information and user space tools.

-config BATMAN_DEBUG +config BATMAN_ADV_DEBUG bool "B.A.T.M.A.N. debugging" - depends on BATMAN != n - help + depends on BATMAN_ADV != n + ---help---

This is an option for use by developers; most people should say N here. This enables compilation of support for