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

[Ben Hutchings]

Author: benh
Date: Mon May 28 00:28:29 2012
New Revision: 19040

Log:
Explicitly disable NET_CALXEDA_XGMAC; this is only useful on specific SoCs

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	Sun May 27 21:32:18 2012	(r19039)
+++ dists/trunk/linux-2.6/debian/changelog	Mon May 28 00:28:29 2012	(r19040)
@@ -6,7 +6,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_TEAM, ATH6KL.
+    NET_TEAM, ATH6KL.
 
   [ Ben Hutchings ]
   * DFSG: Remove the new vs6624 driver, which contains non-free firmware

Modified: dists/trunk/linux-2.6/debian/config/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/config	Sun May 27 21:32:18 2012	(r19039)
+++ dists/trunk/linux-2.6/debian/config/config	Mon May 28 00:28:29 2012	(r19040)
@@ -1781,7 +1781,7 @@
 ##
 ## file: drivers/net/ethernet/calxeda/Kconfig
 ##
-CONFIG_NET_CALXEDA_XGMAC=m
+# CONFIG_NET_CALXEDA_XGMAC is not set
 
 ##
 ## file: drivers/net/ethernet/chelsio/Kconfig