Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

[deliverable/linux.git] / net / batman-adv / Kconfig

diff --git a/net/batman-adv/Kconfig b/net/batman-adv/Kconfig
index f66930ee3c0b06a753c41bf70cafc0e14de330a5..833bb145ba3ce445d585dd86b7e925d4350476c8 100644 (file)
--- a/net/batman-adv/Kconfig
+++ b/net/batman-adv/Kconfig
@@ -66,7 +66,7 @@ config BATMAN_ADV_NC
 
 config BATMAN_ADV_MCAST
        bool "Multicast optimisation"
-       depends on BATMAN_ADV
+       depends on BATMAN_ADV && INET && !(BRIDGE=m && BATMAN_ADV=y)
        default n
        help
          This option enables the multicast optimisation which aims to