diff --git a/debian/changelog b/debian/changelog index 24d8d5445..795d3c897 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,7 +5,7 @@ linux-2.6 (3.4-1~experimental.1) UNRELEASED; urgency=low * 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 Mon, 21 May 2012 01:37:21 +0100 diff --git a/debian/config/config b/debian/config/config index 7b50cd19b..a7227c36d 100644 --- a/debian/config/config +++ b/debian/config/config @@ -2088,6 +2088,13 @@ CONFIG_SLIP_COMPRESSED=y CONFIG_SLIP_SMART=y 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 ##