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

[Maximilian Attems]

Author: maks
Date: Fri May 25 14:02:15 2012
New Revision: 19034

Log:
topconfig enable NET_CALXEDA_XGMAC

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	Thu May 24 07:31:00 2012	(r19033)
+++ dists/trunk/linux-2.6/debian/changelog	Fri May 25 14:02:15 2012	(r19034)
@@ -4,7 +4,8 @@
 
   * 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 <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	Thu May 24 07:31:00 2012	(r19033)
+++ dists/trunk/linux-2.6/debian/config/config	Fri May 25 14:02:15 2012	(r19034)
@@ -1779,6 +1779,11 @@
 CONFIG_BNA=m
 
 ##
+## file: drivers/net/ethernet/calxeda/Kconfig
+##
+CONFIG_NET_CALXEDA_XGMAC=m
+
+##
 ## file: drivers/net/ethernet/chelsio/Kconfig
 ##
 CONFIG_NET_VENDOR_CHELSIO=y