From: Felix Fietkau <nbd@openwrt.org>
Date: Mon, 25 May 2009 14:51:58 +0000 (+0000)
Subject: merge r16056 to 8.09
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=3a928fa49995e953a969fd9d7a89f34bc9eba0f0;p=openwrt%2Fsvn-archive%2Farchive.git

merge r16056 to 8.09

SVN-Revision: 16057
---

diff --git a/package/kernel/modules/network.mk b/package/kernel/modules/network.mk
index fd5b6ccac2..48f64a2b02 100644
--- a/package/kernel/modules/network.mk
+++ b/package/kernel/modules/network.mk
@@ -232,6 +232,7 @@ define KernelPackage/ipv6
 	CONFIG_IPV6_PRIVACY=y \
 	CONFIG_IPV6_MULTIPLE_TABLES=y \
 	CONFIG_IPV6_MROUTE=y \
+	CONFIG_IPV6_PIMSM_V2=n \
 	CONFIG_IPV6_SUBTREES=y
   FILES:=$(LINUX_DIR)/net/ipv6/ipv6.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,20,ipv6)