Explicitly disable NET_CALXEDA_XGMAC; this is only useful on specific SoCs

svn path=/dists/trunk/linux-2.6/; revision=19040
This commit is contained in:
Ben Hutchings 2012-05-28 00:28:29 +00:00
parent 809bdf1189
commit 6c0c49dd57
2 changed files with 2 additions and 2 deletions

2
debian/changelog vendored
View File

@ -6,7 +6,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_TEAM, ATH6KL.
NET_TEAM, ATH6KL.
[ Ben Hutchings ]
* DFSG: Remove the new vs6624 driver, which contains non-free firmware

View File

@ -1781,7 +1781,7 @@ CONFIG_BNA=m
##
## file: drivers/net/ethernet/calxeda/Kconfig
##
CONFIG_NET_CALXEDA_XGMAC=m
# CONFIG_NET_CALXEDA_XGMAC is not set
##
## file: drivers/net/ethernet/chelsio/Kconfig