diff --git a/debian/changelog b/debian/changelog
index 8059081f0..1b8f63f2c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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
diff --git a/debian/config/config b/debian/config/config
index b35640f62..49e5b6653 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -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