The following commit has been merged in the linux branch: commit f601f54446c9a8842f21f2dc07e62c8387b8f733 Author: Sven Eckelmann sven.eckelmann@gmx.de Date: Mon Jan 25 10:09:46 2010 +0100

batman-adv: depend on NET instead of PACKET in Kconfig

The code which uses the raw packet sockets was removed. The only related dependencies are the skb and netdev handling code. This is provided by NET in Kconfig.

Signed-off-by: Sven Eckelmann sven.eckelmann@gmx.de

diff --git a/drivers/staging/batman-adv/Kconfig b/drivers/staging/batman-adv/Kconfig index 69e8fb0..1e7e0a8 100644 --- a/drivers/staging/batman-adv/Kconfig +++ b/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 && PACKET + depends on PROC_FS && NET default n ---help---