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

[Maximilian Attems]

Author: maks
Date: Mon Aug  2 16:39:00 2010
New Revision: 16051

Log:
topconfig enable modular l2tp and friends

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:38:34 2010	(r16050)
+++ dists/trunk/linux-2.6/debian/changelog	Mon Aug  2 16:39:00 2010	(r16051)
@@ -7,7 +7,7 @@
   * 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, IP_MROUTE_MULTIPLE_TABLES,
-    IPV6_MROUTE_MULTIPLE_TABLES, NET_DCCPPROBE, NET_SCTPPROBE.
+    IPV6_MROUTE_MULTIPLE_TABLES, NET_DCCPPROBE, NET_SCTPPROBE, L2TP.
   * 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:38:34 2010	(r16050)
+++ dists/trunk/linux-2.6/debian/config/config	Mon Aug  2 16:39:00 2010	(r16051)
@@ -3788,6 +3788,15 @@
 ##
 ## file: net/llc/Kconfig
 ##
+CONFIG_L2TP=m
+CONFIG_L2TP_DEBUGFS=m
+CONFIG_L2TP_V3=y
+CONFIG_L2TP_IP=m
+CONFIG_L2TP_ETH=m
+
+##
+## file: net/llc/Kconfig
+##
 CONFIG_LLC2=m
 
 ##