[kernel] r16049 - in dists/trunk/linux-2.6/debian: . config

[Maximilian Attems]

Author: maks
Date: Mon Aug  2 16:38:03 2010
New Revision: 16049

Log:
topconfig enable IP_MROUTE_MULTIPLE_TABLES and IPV6_MROUTE_MULTIPLE_TABLES

Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/config

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Mon Aug  2 16:37:41 2010	(r16048)
+++ dists/trunk/linux-2.6/debian/changelog	Mon Aug  2 16:38:03 2010	(r16049)
@@ -6,7 +6,8 @@
 
   * 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.
 

Modified: dists/trunk/linux-2.6/debian/config/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/config	Mon Aug  2 16:37:41 2010	(r16048)
+++ dists/trunk/linux-2.6/debian/config/config	Mon Aug  2 16:38:03 2010	(r16049)
@@ -3671,6 +3671,7 @@
 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_MULTIPLE_TABLES=y
 CONFIG_IPV6_SUBTREES=y
 CONFIG_IPV6_MROUTE=y
+CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
 CONFIG_IPV6_PIMSM_V2=y
 
 ##