[commits] [git] batman-adv branch, linux, updated. GregKH-20091208-22725-g60b5af8

The following commit has been merged in the linux branch: commit ae67491ea085529759ab7475f73e7f3f1e825704 Author: Andrew Lunn andrew@lunn.ch Date: Sat Dec 12 23:39:47 2009 +0100

Staging: batman-adv: Add Kconfig dependancies on PROC_FS and PACKET.

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 7632f57..1d74dab 100644 --- a/drivers/staging/batman-adv/Kconfig +++ b/drivers/staging/batman-adv/Kconfig @@ -4,6 +4,7 @@

config BATMAN_ADV tristate "B.A.T.M.A.N. Advanced Meshing Protocol" + depends on PROC_FS && PACKET default n ---help---