The following commit has been merged in the linux branch: commit 0fce64362d4f2144586e3ffcff6f259bf8abc2f8 Author: Sven Eckelmann sven.eckelmann@gmx.de Date: Fri Feb 19 16:18:04 2010 +0100

Staging: 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 Signed-off-by: Andrew Lunn andrew@lunn.ch Signed-off-by: Greg Kroah-Hartman gregkh@suse.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---