From 9f44c99fd765017c334848a75adae5afb136f49c Mon Sep 17 00:00:00 2001 From: Maximilian Attems Date: Mon, 2 Aug 2010 16:38:03 +0000 Subject: [PATCH] topconfig enable IP_MROUTE_MULTIPLE_TABLES and IPV6_MROUTE_MULTIPLE_TABLES svn path=/dists/trunk/linux-2.6/; revision=16049 --- debian/changelog | 3 ++- debian/config/config | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 14988b5ee..09ed08f74 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,7 +6,8 @@ linux-2.6 (2.6.35-1~experimental.1) UNRELEASED; urgency=low * topconfig enable BLK_CGROUP, NETFILTER_XT_TARGET_TEE, VMWARE_BALLOON, ATH9K_HTC, TOUCHSCREEN_HAMPSHIRE, TOUCHSCREEN_TPS6507X, SND_ASIHPI, - SQUASHFS_XATTRS, RCU_FAST_NO_HZ, COMPACTION. + SQUASHFS_XATTRS, RCU_FAST_NO_HZ, COMPACTION, IP_MROUTE_MULTIPLE_TABLES, + IPV6_MROUTE_MULTIPLE_TABLES. * x86 enable INTEL_IDLE, ACPI_HED, ACPI_APEI, ACPI_APEI_GHES, PCI_CNB20LE_QUIRK. diff --git a/debian/config/config b/debian/config/config index 9634c6457..0f2feaa5b 100644 --- a/debian/config/config +++ b/debian/config/config @@ -3671,6 +3671,7 @@ CONFIG_NET_IPIP=m CONFIG_NET_IPGRE=m CONFIG_NET_IPGRE_BROADCAST=y CONFIG_IP_MROUTE=y +CONFIG_IP_MROUTE_MULTIPLE_TABLES=y CONFIG_IP_PIMSM_V1=y CONFIG_IP_PIMSM_V2=y # CONFIG_ARPD is not set @@ -3758,6 +3759,7 @@ CONFIG_IPV6_TUNNEL=m CONFIG_IPV6_MULTIPLE_TABLES=y CONFIG_IPV6_SUBTREES=y CONFIG_IPV6_MROUTE=y +CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y CONFIG_IPV6_PIMSM_V2=y ##