diff --git a/debian/changelog b/debian/changelog
index ad554ec2a..22ce7b279 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ linux (3.2.21-3) UNRELEASED; urgency=low
 
   * driver core: remove __must_check from device_create_file
     (fixes FTBFS on sparc)
+  * i2400m: Disable I2400M_SDIO; hardware did not reach production
 
  -- Ben Hutchings <ben@decadent.org.uk>  Wed, 27 Jun 2012 02:56:49 +0100
 
diff --git a/debian/config/config b/debian/config/config
index 2e76052e3..2eecadadb 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -1546,8 +1546,7 @@ CONFIG_EEPROM_93CX6=m
 ##
 ## file: drivers/misc/iwmc3200top/Kconfig
 ##
-# CONFIG_IWMC3200TOP_DEBUG is not set
-# CONFIG_IWMC3200TOP_DEBUGFS is not set
+# CONFIG_IWMC3200TOP is not set
 
 ##
 ## file: drivers/misc/lis3lv02d/Kconfig
@@ -2160,8 +2159,7 @@ CONFIG_WAN_ROUTER_DRIVERS=m
 ## file: drivers/net/wimax/i2400m/Kconfig
 ##
 CONFIG_WIMAX_I2400M_USB=m
-CONFIG_WIMAX_I2400M_SDIO=m
-CONFIG_WIMAX_IWMC3200_SDIO=y
+# CONFIG_WIMAX_I2400M_SDIO is not set
 CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
 
 ##