diff --git a/debian/changelog b/debian/changelog index 5a9626a7b..24d8d5445 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,7 +4,8 @@ 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. + NETFILTER_XT_MATCH_NFACCT, NET_SCH_PLUG, SCSI_UFSHCD, SCSI_VIRTIO, + NET_CALXEDA_XGMAC. -- Ben Hutchings Mon, 21 May 2012 01:37:21 +0100 diff --git a/debian/config/config b/debian/config/config index 5a032ba4e..7b50cd19b 100644 --- a/debian/config/config +++ b/debian/config/config @@ -1778,6 +1778,11 @@ CONFIG_NET_VENDOR_BROCADE=y ## CONFIG_BNA=m +## +## file: drivers/net/ethernet/calxeda/Kconfig +## +CONFIG_NET_CALXEDA_XGMAC=m + ## ## file: drivers/net/ethernet/chelsio/Kconfig ##