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

[Maximilian Attems]

Author: maks
Date: Mon May 17 01:34:34 2010
New Revision: 15697

Log:
topconfig enable modular MACVTAP

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 May 17 01:34:24 2010	(r15696)
+++ dists/trunk/linux-2.6/debian/changelog	Mon May 17 01:34:34 2010	(r15697)
@@ -5,7 +5,8 @@
 
   [ maximilian attems ]
   * topconfig enable IPV6_SIT_6RD, NETFILTER_XT_TARGET_CT, IP_VS_PROTO_SCTP,
-    NF_CONNTRACK_ZONES, CAN_PLX_PCI, TI_DAC7512, SCSI_HPSA, PATA_TOSHIBA.
+    NF_CONNTRACK_ZONES, CAN_PLX_PCI, TI_DAC7512, SCSI_HPSA, PATA_TOSHIBA,
+    MACVTAP.
   
   [ Ben Hutchings ]
   * Prepare debconf templates for translation (Closes: #576758)

Modified: dists/trunk/linux-2.6/debian/config/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/config	Mon May 17 01:34:24 2010	(r15696)
+++ dists/trunk/linux-2.6/debian/config/config	Mon May 17 01:34:34 2010	(r15697)
@@ -1407,6 +1407,7 @@
 CONFIG_DUMMY=m
 CONFIG_BONDING=m
 CONFIG_MACVLAN=m
+CONFIG_MACVTAP=m
 CONFIG_EQUALIZER=m
 CONFIG_TUN=m
 CONFIG_VETH=m