topconfig enable IP_MROUTE_MULTIPLE_TABLES and IPV6_MROUTE_MULTIPLE_TABLES

svn path=/dists/trunk/linux-2.6/; revision=16049
This commit is contained in:
Maximilian Attems 2010-08-02 16:38:03 +00:00
parent cbcf69b748
commit 9f44c99fd7
2 changed files with 4 additions and 1 deletions

3
debian/changelog vendored
View File

@ -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.

View File

@ -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
##