diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index 1c1fde99ba8e..cfdfb2c89d4a 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -305,7 +305,6 @@ device		wlan_amrr		# AMRR transmit rate control algorithm
 device		ath			# Atheros CardBus/PCI NICs
 device		ath_hal			# Atheros CardBus/PCI chip support
 options 	AH_AR5416_INTERRUPT_MITIGATION # AR5416 interrupt mitigation
-options 	ATH_ENABLE_11N		# Enable 802.11n support for AR5416 and later
 device		ath_rate_sample		# SampleRate tx rate control for ath
 #device		bwi			# Broadcom BCM430x/BCM431x wireless NICs.
 #device		bwn			# Broadcom BCM43xx wireless NICs.
diff --git a/sys/arm/conf/ARMADA38X b/sys/arm/conf/ARMADA38X
index d0c7ddcef60b..bb7ef098f350 100644
--- a/sys/arm/conf/ARMADA38X
+++ b/sys/arm/conf/ARMADA38X
@@ -90,7 +90,6 @@ device		wlan		# 802.11 support
 device		ath		# Atheros CardBus/PCI NICs
 device		ath_hal
 device		ath_rate_sample
-options 	ATH_ENABLE_11N
 
 # CESA
 device		cesa
diff --git a/sys/conf/options b/sys/conf/options
index f20e43aad962..555484360a2b 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -816,7 +816,6 @@ ATH_TXBUF		opt_ath.h
 ATH_RXBUF		opt_ath.h
 ATH_DIAGAPI		opt_ath.h
 ATH_TX99_DIAG		opt_ath.h
-ATH_ENABLE_11N		opt_ath.h
 ATH_ENABLE_DFS		opt_ath.h
 ATH_EEPROM_FIRMWARE	opt_ath.h
 ATH_ENABLE_RADIOTAP_VENDOR_EXT	opt_ath.h
diff --git a/sys/dev/ath/if_athvar.h b/sys/dev/ath/if_athvar.h
index f706b360946a..96c4318d5987 100644
--- a/sys/dev/ath/if_athvar.h
+++ b/sys/dev/ath/if_athvar.h
@@ -59,6 +59,7 @@
 /*
  * 802.11n requires more TX and RX buffers to do AMPDU.
  */
+#define	ATH_ENABLE_11N			/* 802.11n support for AR5416 and later */
 #ifdef	ATH_ENABLE_11N
 #define	ATH_TXBUF	512
 #define	ATH_RXBUF	512
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index 948c44114d7d..461a21fe7b70 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -261,7 +261,6 @@ device		wlan_amrr		# AMRR transmit rate control algorithm
 device		ath			# Atheros CardBus/PCI NICs
 device		ath_hal			# Atheros CardBus/PCI chip support
 options 	AH_AR5416_INTERRUPT_MITIGATION # AR5416 interrupt mitigation
-options 	ATH_ENABLE_11N		# Enable 802.11n support for AR5416 and later
 device		ath_rate_sample		# SampleRate tx rate control for ath
 #device		bwi			# Broadcom BCM430x/BCM431x wireless NICs.
 #device		bwn			# Broadcom BCM43xx wireless NICs.
diff --git a/sys/powerpc/conf/GENERIC64 b/sys/powerpc/conf/GENERIC64
index ac041c420ee0..9d2de9c8095b 100644
--- a/sys/powerpc/conf/GENERIC64
+++ b/sys/powerpc/conf/GENERIC64
@@ -244,7 +244,6 @@ device		wlan_amrr	# AMRR transmit rate control algorithm
 device		ath		# Atheros CardBus/PCI NICs
 device		ath_hal		# Atheros CardBus/PCI chip support
 options 	AH_AR5416_INTERRUPT_MITIGATION	# AR5416 interrupt mitigation
-options 	ATH_ENABLE_11N	# Enable 802.11n support for AR5416 and later
 device		ath_rate_sample	# SampleRate tx rate control for ath
 
 # FireWire support
diff --git a/sys/powerpc/conf/GENERIC64LE b/sys/powerpc/conf/GENERIC64LE
index d90018802d37..6ca1a01e5969 100644
--- a/sys/powerpc/conf/GENERIC64LE
+++ b/sys/powerpc/conf/GENERIC64LE
@@ -240,7 +240,6 @@ device		wlan_amrr	# AMRR transmit rate control algorithm
 device		ath		# Atheros CardBus/PCI NICs
 device		ath_hal		# Atheros CardBus/PCI chip support
 options 	AH_AR5416_INTERRUPT_MITIGATION	# AR5416 interrupt mitigation
-options 	ATH_ENABLE_11N	# Enable 802.11n support for AR5416 and later
 device		ath_rate_sample	# SampleRate tx rate control for ath
 
 # FireWire support