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

[Maximilian Attems]

Author: maks
Date: Fri May 25 14:02:26 2012
New Revision: 19035

Log:
topconfig enable NET_TEAM options

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	Fri May 25 14:02:15 2012	(r19034)
+++ dists/trunk/linux-2.6/debian/changelog	Fri May 25 14:02:26 2012	(r19035)
@@ -5,7 +5,7 @@
   * Enable DM_VERITY, NF_CONNTRACK_TIMEOUT, NF_CT_NETLINK_TIMEOUT,
     IP_NF_MATCH_RPFILTER, IP6_NF_MATCH_RPFILTER, NETFILTER_NETLINK_ACCT,
     NETFILTER_XT_MATCH_NFACCT, NET_SCH_PLUG, SCSI_UFSHCD, SCSI_VIRTIO,
-    NET_CALXEDA_XGMAC.
+    NET_CALXEDA_XGMAC, NET_TEAM.
 
  -- Ben Hutchings <ben at decadent.org.uk>  Mon, 21 May 2012 01:37:21 +0100
 

Modified: dists/trunk/linux-2.6/debian/config/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/config	Fri May 25 14:02:15 2012	(r19034)
+++ dists/trunk/linux-2.6/debian/config/config	Fri May 25 14:02:26 2012	(r19035)
@@ -2089,6 +2089,13 @@
 CONFIG_SLIP_MODE_SLIP6=y
 
 ##
+## file: drivers/net/team/Kconfig
+##
+CONFIG_NET_TEAM=m
+CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
+CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
+
+##
 ## file: drivers/net/tokenring/Kconfig
 ##
 CONFIG_TR=y