PERFORCE change 139749 for review

[Sam Leffler]

http://perforce.freebsd.org/chv.cgi?CH=139749

Change 139749 by sam at sam_ebb on 2008/04/10 17:11:10

	strip wlan_scan_sta and awi

Affected files ...

.. //depot/projects/vap/sys/amd64/conf/GENERIC#12 edit
.. //depot/projects/vap/sys/arm/conf/AVILA#9 edit
.. //depot/projects/vap/sys/arm/conf/HL200#6 edit
.. //depot/projects/vap/sys/arm/conf/KB920X#6 edit
.. //depot/projects/vap/sys/i386/conf/GENERIC#12 edit
.. //depot/projects/vap/sys/pc98/conf/GENERIC#10 edit
.. //depot/projects/vap/sys/sparc64/conf/GENERIC#11 edit

Differences ...

==== //depot/projects/vap/sys/amd64/conf/GENERIC#12 (text+ko) ====

@@ -239,12 +239,10 @@
 device		wlan_ccmp	# 802.11 CCMP support
 device		wlan_tkip	# 802.11 TKIP support
 device		wlan_amrr	# AMRR transmit rate control algorithm
-device		wlan_scan_sta	# 802.11 STA mode scanning
 device		an		# Aironet 4500/4800 802.11 wireless NICs.
 device		ath		# Atheros pci/cardbus NIC's
 device		ath_hal		# Atheros HAL (Hardware Access Layer)
 device		ath_rate_sample	# SampleRate tx rate control for ath
-device		awi		# BayStack 660 and others
 device		ral		# Ralink Technology RT2500 wireless NICs.
 device		wi		# WaveLAN/Intersil/Symbol 802.11 wireless NICs.
 

==== //depot/projects/vap/sys/arm/conf/AVILA#9 (text+ko) ====

@@ -130,7 +130,6 @@
 device		wlan_wep	# 802.11 WEP support
 device		wlan_ccmp	# 802.11 CCMP support
 device		wlan_tkip	# 802.11 TKIP support
-device		wlan_scan_sta
 device		wlan_xauth
 device		ath		# Atheros pci/cardbus NIC's
 device		ath_hal		# Atheros HAL (Hardware Access Layer)

==== //depot/projects/vap/sys/arm/conf/HL200#6 (text+ko) ====

@@ -147,4 +147,3 @@
 device          wlan_ccmp       # 802.11 CCMP support
 device          wlan_tkip       # 802.11 TKIP support
 device          wlan_amrr       # AMRR transmit rate control algorithm
-device          wlan_scan_sta   # 802.11 STA mode scanning

==== //depot/projects/vap/sys/arm/conf/KB920X#6 (text) ====

@@ -135,4 +135,3 @@
 device          wlan_ccmp       # 802.11 CCMP support
 device          wlan_tkip       # 802.11 TKIP support
 device          wlan_amrr       # AMRR transmit rate control algorithm
-device          wlan_scan_sta   # 802.11 STA mode scanning

==== //depot/projects/vap/sys/i386/conf/GENERIC#12 (text+ko) ====

@@ -254,7 +254,6 @@
 device		wlan_tkip	# 802.11 TKIP support
 device		wlan_amrr	# AMRR transmit rate control algorithm
 device		wlan_rssadapt	# RSSADAPT transmit rate control algorithm
-device		wlan_scan_sta	# 802.11 STA mode scanning
 device		an		# Aironet 4500/4800 802.11 wireless NICs.
 device		ath		# Atheros pci/cardbus NIC's
 device		ath_hal		# Atheros HAL (Hardware Access Layer)

==== //depot/projects/vap/sys/pc98/conf/GENERIC#10 (text+ko) ====

@@ -215,12 +215,10 @@
 device		wlan_ccmp	# 802.11 CCMP support
 device		wlan_tkip	# 802.11 TKIP support
 device		wlan_amrr	# AMRR transmit rate control algorithm
-device		wlan_scan_sta	# 802.11 STA mode scanning
 device		an		# Aironet 4500/4800 802.11 wireless NICs.
 device		ath		# Atheros pci/cardbus NIC's
 device		ath_hal		# Atheros HAL (Hardware Access Layer)
 device		ath_rate_sample	# SampleRate tx rate control for ath
-device		awi		# BayStack 660 and others
 device		ral		# Ralink Technology RT2500 wireless NICs.
 device		wi		# WaveLAN/Intersil/Symbol 802.11 wireless NICs.
 #device		wl		# Older non 802.11 Wavelan wireless NIC.

==== //depot/projects/vap/sys/sparc64/conf/GENERIC#11 (text+ko) ====

@@ -195,7 +195,6 @@
 device		wlan_wep	# 802.11 WEP support
 device		wlan_ccmp	# 802.11 CCMP support
 device		wlan_tkip	# 802.11 TKIP support
-device		wlan_scan_sta	# 802.11 STA mode scanning
 device		ath		# Atheros pci/cardbus NIC's
 device		ath_hal		# Atheros HAL (Hardware Access Layer)
 device		ath_rate_sample	# SampleRate tx rate control for ath