diff --git a/debian/changelog b/debian/changelog
index bb53df442..2c624224b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -36,6 +36,7 @@ linux-2.6 (2.6.25~rc5-1~experimental.1) UNRELEASED; urgency=low
     protection from user allocation - /proc/sys/vm/mmap_min_addr tunable.
   * [sparc]: Enable SCSI_SCAN_ASYNC.
   * [i386]: Enable TC1100_WMI, SND_SIS7019, CRYPTO_SALSA20_586.
+  * topconfig: Centralize old IEEE80211 stack options. (closes: #470558)
 
   [ Martin Michlmayr ]
   * [arm/armel] Add a kernel for Orion based devices, such as the QNAP
diff --git a/debian/config/arm/config.footbridge b/debian/config/arm/config.footbridge
index c7f48b03c..72da8a62c 100644
--- a/debian/config/arm/config.footbridge
+++ b/debian/config/arm/config.footbridge
@@ -267,11 +267,6 @@ CONFIG_WINBOND_FIR=m
 # CONFIG_VLSI_FIR is not set
 # CONFIG_VIA_FIR is not set
 # CONFIG_BT is not set
-CONFIG_IEEE80211=m
-# CONFIG_IEEE80211_DEBUG is not set
-CONFIG_IEEE80211_CRYPT_WEP=m
-CONFIG_IEEE80211_CRYPT_CCMP=m
-CONFIG_IEEE80211_CRYPT_TKIP=m
 
 #
 # Device Drivers
diff --git a/debian/config/arm/config.iop32x b/debian/config/arm/config.iop32x
index 71e9e8832..1c246ff0f 100644
--- a/debian/config/arm/config.iop32x
+++ b/debian/config/arm/config.iop32x
@@ -289,13 +289,6 @@ CONFIG_BT_HCIBCM203X=m
 CONFIG_BT_HCIBPA10X=m
 CONFIG_BT_HCIBFUSB=m
 CONFIG_BT_HCIVHCI=m
-CONFIG_IEEE80211=m
-# CONFIG_IEEE80211_DEBUG is not set
-CONFIG_IEEE80211_CRYPT_WEP=m
-CONFIG_IEEE80211_CRYPT_CCMP=m
-# CONFIG_IEEE80211_CRYPT_TKIP is not set
-CONFIG_IEEE80211_SOFTMAC=m
-# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
 CONFIG_WIRELESS_EXT=y
 
 #
diff --git a/debian/config/arm/config.ixp4xx b/debian/config/arm/config.ixp4xx
index 8acb8413f..f6ab673c1 100644
--- a/debian/config/arm/config.ixp4xx
+++ b/debian/config/arm/config.ixp4xx
@@ -434,11 +434,6 @@ CONFIG_BT_HCIBCM203X=m
 CONFIG_BT_HCIBPA10X=m
 CONFIG_BT_HCIBFUSB=m
 CONFIG_BT_HCIVHCI=m
-CONFIG_IEEE80211=m
-# CONFIG_IEEE80211_DEBUG is not set
-CONFIG_IEEE80211_CRYPT_WEP=m
-CONFIG_IEEE80211_CRYPT_CCMP=m
-# CONFIG_IEEE80211_CRYPT_TKIP is not set
 
 #
 # Device Drivers
diff --git a/debian/config/arm/config.versatile b/debian/config/arm/config.versatile
index e836b9642..961107b1b 100644
--- a/debian/config/arm/config.versatile
+++ b/debian/config/arm/config.versatile
@@ -351,13 +351,6 @@ CONFIG_MAC80211=m
 CONFIG_MAC80211_RCSIMPLE=y
 # CONFIG_MAC80211_DEBUGFS is not set
 # CONFIG_MAC80211_DEBUG is not set
-CONFIG_IEEE80211=m
-# CONFIG_IEEE80211_DEBUG is not set
-CONFIG_IEEE80211_CRYPT_WEP=m
-CONFIG_IEEE80211_CRYPT_CCMP=m
-# CONFIG_IEEE80211_CRYPT_TKIP is not set
-CONFIG_IEEE80211_SOFTMAC=m
-# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
 CONFIG_RFKILL=m
 CONFIG_RFKILL_INPUT=m
 CONFIG_NET_9P=m
diff --git a/debian/config/mips/config.4kc-malta b/debian/config/mips/config.4kc-malta
index f9f42831d..b6aa8905c 100644
--- a/debian/config/mips/config.4kc-malta
+++ b/debian/config/mips/config.4kc-malta
@@ -650,13 +650,6 @@ CONFIG_BT_HCIBCM203X=m
 CONFIG_BT_HCIBPA10X=m
 CONFIG_BT_HCIBFUSB=m
 CONFIG_BT_HCIVHCI=m
-CONFIG_IEEE80211=m
-# CONFIG_IEEE80211_DEBUG is not set
-CONFIG_IEEE80211_CRYPT_WEP=m
-CONFIG_IEEE80211_CRYPT_CCMP=m
-CONFIG_IEEE80211_CRYPT_TKIP=m
-CONFIG_IEEE80211_SOFTMAC=m
-# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
 CONFIG_WIRELESS_EXT=y
 CONFIG_FIB_RULES=y
 
diff --git a/debian/config/mips/config.5kc-malta b/debian/config/mips/config.5kc-malta
index 9ce914211..e429e70f9 100644
--- a/debian/config/mips/config.5kc-malta
+++ b/debian/config/mips/config.5kc-malta
@@ -717,13 +717,6 @@ CONFIG_CFG80211=m
 CONFIG_WIRELESS_EXT=y
 CONFIG_MAC80211=m
 # CONFIG_MAC80211_DEBUG is not set
-CONFIG_IEEE80211=m
-# CONFIG_IEEE80211_DEBUG is not set
-CONFIG_IEEE80211_CRYPT_WEP=m
-CONFIG_IEEE80211_CRYPT_CCMP=m
-CONFIG_IEEE80211_CRYPT_TKIP=m
-CONFIG_IEEE80211_SOFTMAC=m
-# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
 CONFIG_RFKILL=m
 CONFIG_RFKILL_INPUT=m
 
diff --git a/debian/config/mipsel/config.4kc-malta b/debian/config/mipsel/config.4kc-malta
index 406ee86ed..d6c0d5f05 100644
--- a/debian/config/mipsel/config.4kc-malta
+++ b/debian/config/mipsel/config.4kc-malta
@@ -650,13 +650,6 @@ CONFIG_BT_HCIBCM203X=m
 CONFIG_BT_HCIBPA10X=m
 CONFIG_BT_HCIBFUSB=m
 CONFIG_BT_HCIVHCI=m
-CONFIG_IEEE80211=m
-# CONFIG_IEEE80211_DEBUG is not set
-CONFIG_IEEE80211_CRYPT_WEP=m
-CONFIG_IEEE80211_CRYPT_CCMP=m
-CONFIG_IEEE80211_CRYPT_TKIP=m
-CONFIG_IEEE80211_SOFTMAC=m
-# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
 CONFIG_WIRELESS_EXT=y
 CONFIG_FIB_RULES=y
 
diff --git a/debian/config/mipsel/config.5kc-malta b/debian/config/mipsel/config.5kc-malta
index 09d173887..39b50a427 100644
--- a/debian/config/mipsel/config.5kc-malta
+++ b/debian/config/mipsel/config.5kc-malta
@@ -717,13 +717,6 @@ CONFIG_CFG80211=m
 CONFIG_WIRELESS_EXT=y
 CONFIG_MAC80211=m
 # CONFIG_MAC80211_DEBUG is not set
-CONFIG_IEEE80211=m
-# CONFIG_IEEE80211_DEBUG is not set
-CONFIG_IEEE80211_CRYPT_WEP=m
-CONFIG_IEEE80211_CRYPT_CCMP=m
-CONFIG_IEEE80211_CRYPT_TKIP=m
-CONFIG_IEEE80211_SOFTMAC=m
-# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
 CONFIG_RFKILL=m
 CONFIG_RFKILL_INPUT=m
 
diff --git a/debian/config/mipsel/config.r5k-cobalt b/debian/config/mipsel/config.r5k-cobalt
index 9352a7712..b06d32f96 100644
--- a/debian/config/mipsel/config.r5k-cobalt
+++ b/debian/config/mipsel/config.r5k-cobalt
@@ -240,11 +240,6 @@ CONFIG_TIPC_LOG=0
 # CONFIG_HAMRADIO is not set
 # CONFIG_IRDA is not set
 # CONFIG_BT is not set
-CONFIG_IEEE80211=m
-# CONFIG_IEEE80211_DEBUG is not set
-CONFIG_IEEE80211_CRYPT_WEP=m
-# CONFIG_IEEE80211_CRYPT_CCMP is not set
-# CONFIG_IEEE80211_CRYPT_TKIP is not set
 
 #
 # Device Drivers