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

[Maximilian Attems]

Author: maks
Date: Wed May 21 13:08:37 2008
New Revision: 11438

Log:
topconfig enable new 2.6.26 ipv6 features

see 7bc570c8b4f75ddb3fd5dbeb38127cdc4acbcc9c
both seen enabled in fedora too.


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	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Wed May 21 13:08:37 2008
@@ -13,7 +13,8 @@
     USB_ISP1760_HCD, HTC_PASIC3, I2C_PCA_PLATFORM, TOUCHSCREEN_WM97XX,
     JOYSTICK_ZHENHUA, SFC, ACCESSIBILITY, UIO_SMX, LOGIRUMBLEPAD2_FF,
     A11Y_BRAILLE_CONSOLE, EDS_TRIGGER_DEFAULT_ON, VIDEO_ALLOW_V4L1, ATA_ACPI,
-    SATA_PMP, ATA_SFF, USB_SERIAL_MOTOROLA, USB_WDM, MAC80211_MESH.
+    SATA_PMP, ATA_SFF, USB_SERIAL_MOTOROLA, USB_WDM, MAC80211_MESH,
+    IPV6_MROUTE, IPV6_PIMSM_V2.
   * [amd64, i386]: KVM_CLOCK, KVM_GUEST, ISCSI_IBFT_FIND, ISCSI_IBFT, THERMAL,
     EEEPC_LAPTOP, FB_N411.
   * [amd64]: Enable SCSI_DPT_I2O as 64 bit now.

Modified: dists/trunk/linux-2.6/debian/config/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/config	(original)
+++ dists/trunk/linux-2.6/debian/config/config	Wed May 21 13:08:37 2008
@@ -2220,6 +2220,8 @@
 CONFIG_IPV6_TUNNEL=m
 CONFIG_IPV6_MULTIPLE_TABLES=y
 CONFIG_IPV6_SUBTREES=y
+CONFIG_IPV6_MROUTE=y
+CONFIG_IPV6_PIMSM_V2=y
 
 ##
 ## file: net/ipv6/netfilter/Kconfig