diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -287,9 +287,9 @@
 options 	IEEE80211_DEBUG		# enable debug msgs
 options 	IEEE80211_SUPPORT_MESH	# enable 802.11s draft support
 device		wlan_wep		# 802.11 WEP support
+device		wlan_tkip		# 802.11 TKIP support
 device		wlan_ccmp		# 802.11 CCMP support
 device		wlan_gcmp		# 802.11 GCMP support
-device		wlan_tkip		# 802.11 TKIP support
 device		wlan_amrr		# AMRR transmit rate control algorithm
 device		ath			# Atheros CardBus/PCI NICs
 device		ath_hal			# Atheros CardBus/PCI chip support
diff --git a/sys/arm/conf/TEGRA124 b/sys/arm/conf/TEGRA124
--- a/sys/arm/conf/TEGRA124
+++ b/sys/arm/conf/TEGRA124
@@ -107,9 +107,9 @@
 # Wireless NIC cards
 #device		wlan			# 802.11 support
 #device		wlan_wep		# 802.11 WEP support
+#device		wlan_tkip		# 802.11 TKIP support
 #device		wlan_ccmp		# 802.11 CCMP support
 #device		wlan_gcmp		# 802.11 GCMP support
-#device		wlan_tkip		# 802.11 TKIP support
 #device		wlan_amrr		# AMRR transmit rate control algorithm
 
 # PCI
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -888,13 +888,13 @@
 options 	IEEE80211_SUPPORT_MESH	#enable 802.11s D3.0 support
 options 	IEEE80211_SUPPORT_TDMA	#enable TDMA support
 
-#  The `wlan_wep', `wlan_tkip', and `wlan_ccmp' devices provide
-#  support for WEP, TKIP, AES-CCMP and AES-GCMP crypto protocols optionally
-#  used with 802.11 devices that depend on the `wlan' module.
+#  The `wlan_wep', `wlan_tkip', `wlan_ccmp', and `wlan_gcmp' devices provide
+#  support for WEP, TKIP, AES-CCMP and AES-GCMP crypto protocols optionally used
+#  with 802.11 devices that depend on the `wlan' module.
 device		wlan_wep
+device		wlan_tkip
 device		wlan_ccmp
 device		wlan_gcmp
-device		wlan_tkip
 
 #  The `wlan_xauth' device provides support for external (i.e. user-mode)
 #  authenticators for use with 802.11 drivers that use the `wlan'
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -249,9 +249,9 @@
 options 	IEEE80211_DEBUG		# enable debug msgs
 options 	IEEE80211_SUPPORT_MESH	# enable 802.11s draft support
 device		wlan_wep		# 802.11 WEP support
+device		wlan_tkip		# 802.11 TKIP support
 device		wlan_ccmp		# 802.11 CCMP support
 device		wlan_gcmp		# 802.11 GCMP support
-device		wlan_tkip		# 802.11 TKIP support
 device		wlan_amrr		# AMRR transmit rate control algorithm
 device		ath			# Atheros CardBus/PCI NICs
 device		ath_hal			# Atheros CardBus/PCI chip support
diff --git a/sys/powerpc/conf/GENERIC64 b/sys/powerpc/conf/GENERIC64
--- a/sys/powerpc/conf/GENERIC64
+++ b/sys/powerpc/conf/GENERIC64
@@ -234,9 +234,9 @@
 options 	IEEE80211_SUPPORT_MESH	# enable 802.11s draft support
 options 	IEEE80211_DEBUG	# enable debug msgs
 device		wlan_wep	# 802.11 WEP support
+device		wlan_tkip	# 802.11 TKIP support
 device		wlan_ccmp	# 802.11 CCMP support
 device		wlan_gcmp	# 802.11 GCMP support
-device		wlan_tkip	# 802.11 TKIP support
 device		wlan_amrr	# AMRR transmit rate control algorithm
 device		ath		# Atheros CardBus/PCI NICs
 device		ath_hal		# Atheros CardBus/PCI chip support
diff --git a/sys/powerpc/conf/GENERIC64LE b/sys/powerpc/conf/GENERIC64LE
--- a/sys/powerpc/conf/GENERIC64LE
+++ b/sys/powerpc/conf/GENERIC64LE
@@ -230,9 +230,9 @@
 options 	IEEE80211_SUPPORT_MESH	# enable 802.11s draft support
 options 	IEEE80211_DEBUG	# enable debug msgs
 device		wlan_wep	# 802.11 WEP support
+device		wlan_tkip	# 802.11 TKIP support
 device		wlan_ccmp	# 802.11 CCMP support
 device		wlan_gcmp	# 802.11 GCMP support
-device		wlan_tkip	# 802.11 TKIP support
 device		wlan_amrr	# AMRR transmit rate control algorithm
 device		ath		# Atheros CardBus/PCI NICs
 device		ath_hal		# Atheros CardBus/PCI chip support