Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / net / batman-adv / Kconfig

diff --git a/drivers/staging/batman-adv/Kconfig b/net/batman-adv/Kconfig
similarity index 99%
rename from drivers/staging/batman-adv/Kconfig
rename to net/batman-adv/Kconfig
index 8553f35174541a346d5bcf1ad6b327ed81d888d0..6c051ad833eba5f2e798629d22d9930e88f94a88 100644 (file)
--- a/drivers/staging/batman-adv/Kconfig
+++ b/net/batman-adv/Kconfig
@@ -23,4 +23,3 @@ config BATMAN_ADV_DEBUG
          say N here. This enables compilation of support for
          outputting debugging information to the kernel log. The
          output is controlled via the module parameter debug.
-