Don't try to keep in sync with the man page device lists for

802.11 wireless as chipsets used and products change rapidly, but
rather display just a list of the supported chipsets like we do in www.
Discussed with jmc and deraadt

9 files changed, 64 insertions, 3045 deletions

diff --git a/distrib/notes/alpha/hardware b/distrib/notes/alpha/hardware
index 3a61992fc5b..e2688dbe055 100644
--- a/distrib/notes/alpha/hardware
+++ b/distrib/notes/alpha/hardware
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: hardware,v 1.100 2009/03/28 07:39:16 jmc Exp $
+dnl	$OpenBSD: hardware,v 1.101 2009/04/09 16:02:24 jsg Exp $
 OpenBSD/MACHINE OSREV is expected to run on the following hardware.
 If you have hardware that is listed here and are unable to run OpenBSD,
 or if you are able to run OpenBSD on hardware not listed here, please
@@ -515,269 +515,19 @@ Supported Peripherals:
 			SMC 9452TX (1000baseT)
 	Wireless Ethernet Adapters
 		ADMtek ADM8211 IEEE 802.11b PCI adapters
-		    Belkin F5D6001 (version 2 only)
-		    D-Link DWL-520 Rev. C1
-		    LanReady WP2000
-		    Xterasys XN2511B
 		Aironet Communications 4500/4800 IEEE 802.11FH/b PCI adapters
-		    Aironet 4500/4800
-		    Cisco 340/350
 		Atheros IEEE 802.11a/b/g PCI adapters
-		    D-Link DWL-A520
-		    IBM 11ABG WL LAN Mini PCI
-		    Proxim Skyline 4032
-		    Senao NL-5354MP Mini PCI
-		    Wistron CM9 Mini PCI
 		Atheros USB IEEE 802.11a/b/g USB adapters
-		    Compex WLU108AG
-		    Compex WLU108G
-		    D-Link DWL-G132
-		    IODATA WN-G54/US
-		    MELCO WLI-U2-KAMG54
-		    Netgear WG111T
-		    Netgear WG111U
-		    Netgear WPN111
-		    Olitec 000544
-		    PLANET WDL-U357
-		    Siemens Gigaset 108
-		    SMC SMCWUSBT-G
-		    SMC SMCWUSBT-G2
-		    SparkLAN WL-785A
-		    TP-Link TL-WN620G
-		    TRENDware International TEW-444UB
-		    TRENDware International TEW-504UB
-		    Unex Technology UR054ag
-		    ZyXEL XtremeMIMO M-202
 		Conexant/Intersil Prism GT Full-MAC IEEE 802.11a/b/g PCI
-		adapters
-		    D-Link DWL-g650 A1
-		    I-O Data WN-G54/CB
-		    I4 Z-Com XG-600
-		    I4 Z-Com XG-900
-		    Intersil PRISM Indigo
-		    Intersil PRISM Duette
-		    PLANEX GW-DS54G
-		    SMC EZ Connect g 2.4GHz SMC2802W
-		    SMC 2802Wv2
+		    adapters
 		Marvell Libertas IEEE 802.11b/g PCI adapters
-		    Netgear WG311v3
-		    Tenda TWL542P
 		Ralink Technology IEEE 802.11a/b/g PCI adapters
-		    A-Link WL54H
-		    AirLive WN-5000PCI
-		    Amigo AWI-922W Mini PCI
-		    Amigo AWI-926W
-		    AMIT WL531P
-		    AOpen AOI-831
-		    ASUS WL-130G
-		    ASUS WL-130N
-		    ASUS WIFI-G-AAY
-		    Atlantis Land A02-PCI-W54
-		    Belkin F5D7000 v3
-		    Billionton MIWLGRL Mini PCI
-		    Canyon CN-WF511
-		    CNet CWP-854
-		    Compex WLP54G
-		    Conceptronic C54Ri
-		    Digitus DN-7006G-RA
-		    Dynalink WLG25PCI
-		    E-Tech WGPI02
-		    Edimax EW-7128g
-		    Edimax EW-7628Ig
-		    Edimax EW-7728In
-		    Eminent EM3037
-		    Encore ENLWI-G-RLAM
-		    Eusso UGL2454-VPR
-		    Fiberline WL-400P
-		    Gigabyte GN-WIKG Mini PCI
-		    Gigabyte GN-WI01GS Mini PCI
-		    Gigabyte GN-WI02GM Mini PCI
-		    Gigabyte GN-WPKG
-		    Gigabyte GN-WP01GS
-		    Gigabyte GN-WI02GM
-		    Gigabyte GN-WP01GM
-		    Hawking HWP54GR
-		    Hercules HWGPCI-54
-		    iNexQ CR054g-009 (R03)
-		    JAHT WN-4054PCI
-		    KCORP LifeStyle KLS-660
-		    LevelOne WNC-0301 v2
-		    Linksys WMP54G v4
-		    Micronet SP906GK
-		    Minitar MN54GPC-R
-		    MSI MP54G2 Mini PCI
-		    MSI MP6833 Mini PCI
-		    MSI MS-6834
-		    MSI PC54G2
-		    OvisLink EVO-W54PCI
-		    PheeNet HWL-PCIG/RA
-		    Planex PCI-GW-DS300N
-		    Pro-Nets PC80211G
-		    Repotec RP-WP0854
-		    SATech SN-54P
-		    Signamax 065-1798
-		    Sitecom WL-115
-		    SparkLAN WL-660R
-		    SparkLAN WMIR-215GN Mini PCI
-		    Surecom EP-9321-g
-		    Surecom EP-9321-g1
-		    Sweex LC700030
-		    TekComm NE-9321-g
-		    Tonze PC-620C Mini PCI
-		    Tonze PC-6200C
-		    Unex CR054g-R02
-		    Zinwell ZWX-G360 Mini PCI
-		    Zinwell ZWX-G361
-		    Zonet ZEW1600
-		Ralink Technology IEEE 802.11b/g USB adapters
-		    AMIT WL532U
-		    ASUS WL-167g
-		    Belkin F5D7050
-		    Buffalo WLI-U2-KG54
-		    Buffalo WLI-U2-KG54-AI
-		    Buffalo WLI-U2-KG54-YB
-		    CNet CWD-854
-		    Compex WLU54G
-		    Conceptronic C54RU
-		    D-Link DWL-G122 (b1)
-		    Dynalink WLG25USB
-		    E-Tech WGUS02
-		    Eminent 3035
-		    Gigabyte GN-WBKG
-		    Hercules HWGUSB2-54
-		    KCORP LifeStyle KLS-685
-		    Linksys WUSB54G v4
-		    Linksys WUSB54GP v4
-		    MSI MS-6861
-		    MSI MS-6865
-		    MSI MS-6869
-		    Nintendo Wi-Fi USB Connector
-		    Nova Tech NV-902W
-		    OvisLink Evo-W54USB
-		    SerComm UB801R
-		    SparkLAN WL-685R
-		    Sphairon UB801R
-		    Surecom EP-9001-g rev 3A
-		    Sweex LC100060
-		    Tonze UW-6200C
-		    Zaapa ZNWUSB-54
-		    Zinwell ZPlus-G250
-		    Zinwell ZWX-G261
-		    Zonet ZEW2500
-		Ralink Technology USB IEEE 802.11a/b/g USB adapters
-		    3Com Aolynk WUB320g
-		    Abocom WUG2700
-		    Airlink101 AWLL5025
-		    ASUS WL-167g ver 2
-		    Atlantis Land A02-UP1-W54
-		    Belkin F5D7050 ver 3
-		    Belkin F5D9050 ver 3
-		    Buffalo WLI-U2-SG54HP
-		    Buffalo WLI-U2-G54HP
-		    CNet CWD-854 ver F
-		    Conceptronic C54RU ver 2
-		    Corega CG-WLUSB2GL
-		    Corega CG-WLUSB2GO
-		    Corega CG-WLUSB2GPX
-		    D-Link DWL-G122 rev C1
-		    D-Link WUA-1340
-		    Digitus DN-7003GR
-		    Edimax EW-7318Ug
-		    Edimax EW-7318USg
-		    Edimax EW-7618Ug
-		    Gigabyte GN-WB01GS
-		    Gigabyte GN-WI05GS
-		    Hawking HWUG1
-		    Hawking HWU54DM
-		    Hercules HWGUSB2-54-LB
-		    Hercules HWGUSB2-54V2-AP
-		    LevelOne WNC-0301USB v3
-		    Linksys WUSB200
-		    Linksys WUSB54G rev C
-		    Linksys WUSB54GR
-		    Planex GW-US54HP
-		    Planex GW-US54Mini2
-		    Planex GW-USMM
-		    Senao NUB-3701
-		    Sitecom WL-113 ver 2
-		    Sitecom WL-172
-		    Sweex LW053
-		    TP-LINK TL-WN321G
-		Ralink Technology USB IEEE 802.11a/b/g/Draft-N USB adapters
-		    ASUS USB-N11
-		    ASUS WL-160N
-		    Belkin F5D8051 ver 3000
-		    Belkin F5D8053
-		    Buffalo WLI-UC-AG300N
-		    Buffalo WLI-UC-GN
-		    Corega CG-WLUSB300GNM
-		    D-Link DWA-130
-		    D-Link DWA-140
-		    Edimax EW-7711UAn
-		    Edimax EW-7717Un
-		    Edimax EW-7718Un
-		    Gigabyte GN-WB32L
-		    Linksys WUSB600N
-		    Planex GW-USMicroN
-		    Planex GW-US300MiniS
+		Ralink Technology IEEE 802.11a/b/g USB adapters
 		TI ACX100/ACX111 IEEE 802.11a/b/g PCI adapters
-		    D-Link DWL-520+
-		    D-Link DWL-G520+
-		    Hawking HWP54G
-		    Netgear WG311v2
-		    Tornado/ADT 211g
-		    USR USR5416
-		    ZyXEL G-360 EE
 		WaveLAN/IEEE, PRISM 2-3, and Spectrum24 IEEE 802.11b PCI
-		adapters
-		    3Com AirConnect 3CRWE777A
-		    Addtron AWA-100
-		    Belkin F5D6001 (version 1 only)
-		    Corega CGWLPCIA11
-		    D-Link DWL-520 (rev A and B only)
-		    Intersil Mini PCI
-		    Intersil ISL3872
-		    Longshine 8301
-		    NDC/Sohoware NCP130
-		    Netgear MA311
-		    Nortel E-mobility 211818-A
-		    Samsung MagicLAN SWL-2210P
-		    Senao NL-2511MP
-		    Symbol LA4123
+		    adapters
 		WaveLAN/IEEE, PRISM 2-3, and Spectrum24 IEEE 802.11b USB
-		adapters
-		    Acer Warplink USB-400
-		    Actiontec HWU01170
-		    AirVast WM168b
-		    Ambit WLAN
-		    Apacer Wireless Steno MB112
-		    ASUS WL-140
-		    Compaq W100
-		    Corega WLUSB-11
-		    Corega WLUSB-11 Key
-		    D-Link DWL-120 (rev F)
-		    D-Link DWL-122
-		    I-O DATA WN-B11/USB
-		    Intel PRO/Wireless 2011B
-		    Intersil Prism 2X
-		    JVC MP-XP7250
-		    Linksys WUSB11 v3.0
-		    Linksys WUSB12
-		    Melco WLI-USB-KB11
-		    Melco WLI-USB-KS11G
-		    Melco WLI-USB-S11
-		    Microsoft MN510
-		    Netgear MA111 (version 1 only)
-		    Pheenet WL-503IA
-		    Planex GW-US11H
-		    Siemens SpeedStream SS1022
-		    Sitecom WL-022
-		    Syntax USB-400
-		    US Robotics 1120
-		    ViewSonic Airsync
-		    Z-Com XI-725/726
-		    Z-Com XI-735
-		    ZyXEL ZyAIR B-200
+		    adapters
 	Communications Controllers [*]
 		Universal Serial Bus host controllers, including:
 		    USB Universal Host Controller (uhci)
diff --git a/distrib/notes/amd64/hardware b/distrib/notes/amd64/hardware
index 8f3b4b3216b..212a1d04a03 100644
--- a/distrib/notes/amd64/hardware
+++ b/distrib/notes/amd64/hardware
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: hardware,v 1.104 2009/03/28 07:39:16 jmc Exp $
+dnl	$OpenBSD: hardware,v 1.105 2009/04/09 16:02:24 jsg Exp $
 OpenBSD/MACHINE OSREV should work on all Athlon 64-based and
 compatible designs.
 
@@ -459,607 +459,46 @@ dnl		XR16850-based ports (only in the pccom driver)
 		    Compex RL100-ATX 10/100baseTX
 	Wireless Ethernet Adapters
 		ADMtek ADM8211 IEEE 802.11b CardBus adapters
-		    3Com OfficeConnect 3CRSHPW796
-		    Blitz NetWave Point
-		    D-Link DWL-650 Rev. L1
-		    SMC 2635W (version 1 only)
-		    TRENDnet TEW-221PC
 		ADMtek ADM8211 IEEE 802.11b PCI adapters
-		    Belkin F5D6001
-		    D-Link DWL-520 Rev. C1
-		    LanReady WP2000
-		    Xterasys XN2511B
 		Aironet Communications 4500/4800 IEEE 802.11FH/b PCI and PCMCIA
-		adapters
-		    Aironet 4500/4800
-		    Cisco 340/350
+		    adapters
 		Atheros IEEE 802.11a/b/g CardBus adapters
-		    3Com 3CRPAG175
-		    Cisco AIR-CB21AG
-		    D-Link DWL-A650
-		    D-Link DWL-AB650
-		    Elecom LD-WL54
-		    Linksys WPC51AB
-		    Netgear WAB501
-		    Planet WL-3560
-		    Proxim Skyline 4030
-		    SMC SMC2735W
-		    Sony PCWA-C500
 		Atheros IEEE 802.11a/b/g PCI adapters
-		    D-Link DWL-A520
-		    IBM 11ABG WL LAN Mini PCI
-		    Proxim Skyline 4032
-		    Senao NL-5354MP Mini PCI
-		    Wistron CM9 Mini PCI
 		Atheros USB IEEE 802.11a/b/g USB adapters
-		    Compex WLU108AG
-		    Compex WLU108G
-		    D-Link DWL-G132
-		    IODATA WN-G54/US
-		    MELCO WLI-U2-KAMG54
-		    Netgear WG111T
-		    Netgear WG111U
-		    Netgear WPN111
-		    Olitec 000544
-		    Philips SNU6500
-		    PLANET WDL-U357
-		    Siemens Gigaset 108
-		    SMC SMCWUSBT-G
-		    SMC SMCWUSBT-G2
-		    SparkLAN WL-785A
-		    TP-Link TL-WN620G
-		    TRENDware International TEW-444UB
-		    TRENDware International TEW-504UB
-		    Unex Technology UR054ag
-		    ZyXEL XtremeMIMO M-202
 		Atheros USB IEEE 802.11a/b/g/Draft-N USB adapters
-		    Arcadyan WN7512
-		    AVM FRITZ!WLAN USB Stick N
-		    CACE AirPcap Nx
-		    D-Link DWA-160A
-		    IO-Data WN-GDN/US2
-		    Netgear WNDA3100
-		    Netgear WN111 v2
-		    Planex GW-US300
-		    TP-Link TL-WN821N
-		    Ubiquiti SR71 USB
-		    Z-Com UB81
-		    Z-Com UB82
 		Atmel AT76C50x IEEE 802.11b USB adapters
-		    3Com 3CRSHEW696
-		    AboCom BWU613
-		    Accton 2664W
-		    Acer Peripherals AWL300
-		    Acer Peripherals AWL400
-		    Actiontec 802UAT1
-		    Addtron AWU120
-		    Aincomm AWU2000B
-		    Askey Computer Voyager 1010
-		    Askey Computer WLL013 (Intersil Radio)
-		    Askey Computer WLL013 (RFMD Radio)
-		    Atmel AT76C503 (Intersil Radio)
-		    Atmel AT76C503 (RFMD Radio)
-		    Atmel AT76C505 (RFMD Radio)
-		    Atmel AT76C505 (RFMD 2958 Radio)
-		    Atmel AT76C505A (RFMD 2958 Radio)
-		    Atmel AT76C505AS (RFMD 2958 Radio)
-		    Belkin F5D6050
-		    Bluetake BW002
-		    Compaq iPAQ h54xx/h55xx Internal WLAN
-		    Conceptronic C11U
-		    Conceptronic WL210
-		    Corega WLAN USB Stick 11
-		    Dick Smith Electronics CHUSB 611G
-		    Dick Smith Electronics WL200U
-		    Dick Smith Electronics WL240U
-		    Dick Smith Electronics XH1153
-		    D-Link DWL-120 rev E
-		    Geowave GW-US11S
-		    Gigabyte GN-WLBM101
-		    Gigaset WLAN
-		    Hewlett-Packard HN210W
-		    Intel AP310 AnyPoint II
-		    I/O DATA USB WN-B11
-		    Lexar 2662W-AR
-		    Linksys WUSB11 802.11b
-		    Linksys WUSB11 802.11b v2.8
-		    MSI WLAN
-		    Netgear MA101
-		    Netgear MA101 rev B
-		    OQO model 01 WiFi
-		    Ovislink AirLive WL-1120USB
-		    OvisLink AirLive WL-1130USB
-		    Planex Communications GW-US11S
-		    Samsung SWL2100W
-		    Siemens WLL013
-		    SMC EZ Connect 11Mbps (SMC2662w)
-		    SMC EZ Connect 11Mbps v2 (SMC2662wV2)
-		    Tekram U-300C
-		    TRENDnet TEW-229UB
-		    W-Buddie WN210
-		    Z-Com M4Y-750
 		Broadcom AirForce IEEE 802.11b/g CardBus adapters
-		    Buffalo WLI-CB-G54
-		    Linksys WPC54G Ver 3
-		    Linksys WPC54GS Ver 2
-		    TRENDnet TEW-401PCplus
-		    US Robotics 5411
 		Broadcom AirForce IEEE 802.11b/g PCI adapters
-		    Apple Airport Extreme BCM4306
-		    Apple Airport Extreme BCM4318
-		    ASUS WL-138g
-		    Buffalo WLI-CB-G54
-		    Compaq R4035 onboard
-		    HP nx6125
-		    Linksys WPC54G Ver 3
-		    Linksys WPC54GS Ver 2
-		    TRENDnet TEW-401PCplus
-		    US Robotics 5411
 		Conexant/Intersil Prism GT Full-MAC IEEE 802.11a/b/g CardBus
-		adapters
-		    3COM 3CRWE154G72
-		    NETGEAR WG511
-		    SMC EZ Connect g 2.4GHz SMC2835W-v2
-		    Soyo Aerielink
-		    ZyXEL ZyAIR G-100
+		    adapters
 		Conexant/Intersil Prism GT Full-MAC IEEE 802.11a/b/g PCI
-		adapters
-		    D-Link DWL-g650 A1
-		    I-O Data WN-G54/CB
-		    I4 Z-Com XG-600
-		    I4 Z-Com XG-900
-		    Intersil PRISM Indigo
-		    Intersil PRISM Duette
-		    PLANEX GW-DS54G
-		    SMC EZ Connect g 2.4GHz SMC2802W
-		    SMC 2802Wv2
+		    adapters
 		Conexant/Intersil PrismGT SoftMAC IEEE 802.11b/g USB adapters
-		    Belkin F5D7050 (version 1000)
-		    Cohiba Proto Board
-		    D-Link DWL-G120 Cohiba
-		    D-Link DWL-G122 rev A2
-		    FSC Connect2Air E-5400 USB D1700
-		    Gigaset USB Adapter 54
-		    Inventel UR045G
-		    IOGear GWU513
-		    Linksys WUSB54AG
-		    Linksys WUSB54G ver 2
-		    Medion MD40900
-		    Philips CPWUA054
-		    SMC EZ ConnectG SMC2862W-G
-		    Sagem XG703A
-		    Spinnaker DUT
-		    Spinnaker Proto Board
-		    Thomson SpeedTouch 121g
 		Intel PRO/Wireless 2200BG/2225BG/2915ABG IEEE 802.11a/b/g PCI
-		adapters
+		    adapters
 		Intel PRO/Wireless 3945ABG IEEE 802.11a/b/g PCI adapters
 		Intel Wireless WiFi Link 4965AGN IEEE 802.11a/b/g/Draft-N
-		adapters
+		    adapters
 		Marvell Libertas IEEE 802.11b/g CardBus adapters
-		    Netgear WG511v2
-		    Tenda TWL541C
 		Marvell Libertas IEEE 802.11b/g PCI adapters
-		    Netgear WG311v3
-		    Tenda TWL542P
 		Marvell Libertas IEEE 802.11b/g Compact Flash adapters (will be
-		detected as PCMCIA adapters)
-		    Ambicom WL54CF
-		    I-O DATA WN-G54/CF
-		    SparkLAN WCFM-100
-		Ralink Technology IEEE 802.11a/b/g CardBus adapters
-		    A-Link WL54PC
-		    Alfa AWPC036
-		    Amigo AWI-914W
-		    AMIT WL531C
-		    ASUS WL-107G
-		    Atlantis Land A02-PCM-W54
-		    Belkin F5D7010 v2
-		    Canyon CN-WF513
-		    CC&C WL-2102
-		    CNet CWC-854
-		    Compex WL54G
-		    Conceptronic C54RC
-		    Corega CG-WLCB54GL
-		    Digiconnect WL591C
-		    Digitus DN-7001G-RA
-		    E-Tech WGPC02
-		    E-Tech WGPC03
-		    Edimax EW-7108PCg
-		    Eminent EM3036
-		    Encore ENPWI-G-RLAM
-		    Eusso UGL2454-01R
-		    Fibreline WL-400X
-		    Gigabyte GN-WMKG
-		    Gigabyte GN-WM01GS
-		    Gigabyte GN-WM01GM
-		    Hawking HWC54GR
-		    Hercules HWGPCMCIA-54
-		    JAHT WN-4054P
-		    KCORP LifeStyle KLS-611
-		    LevelOne WPC-0301 v2
-		    Micronet SP908GK V3
-		    Minitar MN54GCB-R
-		    MSI CB54G2
-		    MSI MS-6835
-		    Pro-Nets CB80211G
-		    Repotec RP-WB7108
-		    SATech SN-54C
-		    Sitecom WL-112
-		    SparkLAN WL-611R
-		    SparkLAN WPCR-501
-		    Surecom EP-9428-g
-		    Sweex LC500050
-		    TekComm NE-9428-g
-		    Tonze PW-6200C
-		    Unex MR054g-R02
-		    Zinwell ZWX-G160
-		    Zonet ZEW1500
-		Ralink Technology IEEE 802.11a/b/g PCI adapters
-		    A-Link WL54H
-		    AirLive WN-5000PCI
-		    Amigo AWI-922W Mini PCI
-		    Amigo AWI-926W
-		    AMIT WL531P
-		    AOpen AOI-831
-		    ASUS WL-130G
-		    ASUS WL-130N
-		    ASUS WIFI-G-AAY
-		    Atlantis Land A02-PCI-W54
-		    Belkin F5D7000 v3
-		    Billionton MIWLGRL Mini PCI
-		    Canyon CN-WF511
-		    CNet CWP-854
-		    Compex WLP54G
-		    Conceptronic C54Ri
-		    Digitus DN-7006G-RA
-		    Dynalink WLG25PCI
-		    E-Tech WGPI02
-		    Edimax EW-7128g
-		    Edimax EW-7628Ig
-		    Edimax EW-7728In
-		    Eminent EM3037
-		    Encore ENLWI-G-RLAM
-		    Eusso UGL2454-VPR
-		    Fiberline WL-400P
-		    Gigabyte GN-WIKG Mini PCI
-		    Gigabyte GN-WI01GS Mini PCI
-		    Gigabyte GN-WI02GM Mini PCI
-		    Gigabyte GN-WPKG
-		    Gigabyte GN-WP01GS
-		    Gigabyte GN-WI02GM
-		    Gigabyte GN-WP01GM
-		    Hawking HWP54GR
-		    Hercules HWGPCI-54
-		    iNexQ CR054g-009 (R03)
-		    JAHT WN-4054PCI
-		    KCORP LifeStyle KLS-660
-		    LevelOne WNC-0301 v2
-		    Linksys WMP54G v4
-		    Longshine LCS-8031N
-		    Micronet SP906GK
-		    Minitar MN54GPC-R
-		    MSI MP54G2 Mini PCI
-		    MSI MP6833 Mini PCI
-		    MSI MS-6834
-		    MSI PC54G2
-		    OvisLink EVO-W54PCI
-		    PheeNet HWL-PCIG/RA
-		    Planex PCI-GW-DS300N
-		    Pro-Nets PC80211G
-		    Repotec RP-WP0854
-		    SATech SN-54P
-		    Signamax 065-1798
-		    Sitecom WL-115
-		    SparkLAN WL-660R
-		    SparkLAN WMIR-215GN Mini PCI
-		    Surecom EP-9321-g
-		    Surecom EP-9321-g1
-		    Sweex LC700030
-		    TekComm NE-9321-g
-		    Tonze PC-620C Mini PCI
-		    Tonze PC-6200C
-		    Unex CR054g-R02
-		    Zinwell ZWX-G360 Mini PCI
-		    Zinwell ZWX-G361
-		    Zonet ZEW1600
-		Ralink Technology IEEE 802.11b/g USB adapters
-		    AMIT WL532U
-		    ASUS WL-167g
-		    Belkin F5D7050
-		    Buffalo WLI-U2-KG54
-		    Buffalo WLI-U2-KG54-AI
-		    Buffalo WLI-U2-KG54-YB
-		    CNet CWD-854
-		    Compex WLU54G
-		    Conceptronic C54RU
-		    D-Link DWL-G122 (b1)
-		    Dynalink WLG25USB
-		    E-Tech WGUS02
-		    Eminent 3035
-		    Gigabyte GN-WBKG
-		    Hercules HWGUSB2-54
-		    KCORP LifeStyle KLS-685
-		    Linksys WUSB54G v4
-		    Linksys WUSB54GP v4
-		    MSI MS-6861
-		    MSI MS-6865
-		    MSI MS-6869
-		    Nintendo Wi-Fi USB Connector
-		    Nova Tech NV-902W
-		    OvisLink Evo-W54USB
-		    SerComm UB801R
-		    SparkLAN WL-685R
-		    Sphairon UB801R
-		    Surecom EP-9001-g rev 3A
-		    Sweex LC100060
-		    Tonze UW-6200C
-		    Zaapa ZNWUSB-54
-		    Zinwell ZPlus-G250
-		    Zinwell ZWX-G261
-		    Zonet ZEW2500
-		Ralink Technology USB IEEE 802.11a/b/g USB adapters
-		    3Com Aolynk WUB320g
-		    Abocom WUG2700
-		    Airlink101 AWLL5025
-		    ASUS WL-167g ver 2
-		    Atlantis Land A02-UP1-W54
-		    Belkin F5D7050 ver 3
-		    Belkin F5D9050 ver 3
-		    Belkin F5D9050C
-		    Buffalo WLI-U2-SG54HP
-		    Buffalo WLI-U2-G54HP
-		    CNet CWD-854 ver F
-		    Conceptronic C54RU ver 2
-		    Corega CG-WLUSB2GL
-		    Corega CG-WLUSB2GO
-		    Corega CG-WLUSB2GPX
-		    D-Link DWA-110
-		    D-Link DWA-111
-		    D-Link DWL-G122 rev C1
-		    D-Link WUA-1340
-		    Digitus DN-7003GR
-		    Edimax EW-7318Ug
-		    Edimax EW-7318USg
-		    Edimax EW-7618Ug
-		    Gigabyte GN-WB01GS
-		    Gigabyte GN-WI05GS
-		    Hawking HWUG1
-		    Hawking HWU54DM
-		    Hercules HWGUSB2-54-LB
-		    Hercules HWGUSB2-54V2-AP
-		    LevelOne WNC-0301USB v3
-		    Linksys WUSB200
-		    Linksys WUSB54G rev C
-		    Linksys WUSB54GR
-		    Planex GW-US54HP
-		    Planex GW-US54Mini2
-		    Planex GW-USMM
-		    Senao NUB-3701
-		    Sitecom WL-113 ver 2
-		    Sitecom WL-172
-		    Sweex LW053
-		    TP-LINK TL-WN321G
+		    detected as PCMCIA adapters)
+		Ralink Technology IEEE 802.11a/b/g PCI/CardBus adapters
+		Ralink Technology IEEE 802.11a/b/g USB adapters
 		Ralink Technology USB IEEE 802.11a/b/g/Draft-N USB adapters
-		    ASUS USB-N11
-		    ASUS WL-160N
-		    Belkin F5D8051 ver 3000
-		    Belkin F5D8053
-		    Buffalo WLI-UC-AG300N
-		    Buffalo WLI-UC-GN
-		    Corega CG-WLUSB300GNM
-		    D-Link DWA-130
-		    D-Link DWA-140
-		    Edimax EW-7711UAn
-		    Edimax EW-7717Un
-		    Edimax EW-7718Un
-		    Gigabyte GN-WB32L
-		    Linksys WUSB600N
-		    Planex GW-USMicroN
-		    Planex GW-US300MiniS
 		Raytheon Raylink/WebGear Aviator IEEE 802.11FH PCMCIA adapters
-		    Raytheon Raylink WLAN
-		    WebGear Aviator 2.4
-		    WebGear Aviator PRO
 		Realtek RTL8180L IEEE 802.11b CardBus adapters
-		    Allnet ALL0182
-		    Belkin F5D6020 V3
-		    Buffalo WLI-CB-B11
-		    Corega CG-WLCB11V3
-		    D-Link DWL-610
-		    Edimax EW-7106
-		    GigaFast WF721-AEX (R* serial)
-		    Jensen AirLink 6011
-		    Level-One WPC-0101
-		    Linksys WPC11 v4
-		    Netgear MA521
-		    Ovislink AirLive WL-1120PCM
-		    Planet WL-3553
-		    Q-Tec 770WC
-		    Q-Tec 775WC
-		    Roper FreeLan 802.11b
-		    SAFECOM SWLCR-1100
-		    TRENDnet TEW-226PC
-		    VCTnet PC-11B1
-		    Winstron CB-200B
-		    Zonet ZEW1000
-		TI ACX100/ACX111 IEEE 802.11a/b/g CardBus adapters
-		    D-Link DWL-650+
-		    D-Link DWL-G630+
-		    D-Link DWL-G650+
-		    Ergenic ERG WL-003
-		    Hamlet HNWP254
-		    Linksys WPC54Gv2
-		    Microcom Travelcard
-		    Sceptre SC254W+
-		    USR USR5410
-		    ZyXEL G-160
-		TI ACX100/ACX111 IEEE 802.11a/b/g PCI adapters
-		    D-Link DWL-520+
-		    D-Link DWL-G520+
-		    Hawking HWP54G
-		    Netgear WG311v2
-		    Tornado/ADT 211g
-		    USR USR5416
-		    ZyXEL G-360 EE
+		TI ACX100/ACX111 IEEE 802.11a/b/g PCI/CardBus adapters
 		WaveLAN/IEEE, PRISM 2-3, and Spectrum24 IEEE 802.11b Compact
-		Flash adapters (will be detected as PCMCIA adapters)
-		    AmbiCom WL1100C-CF
-		    ASUS SpaceLink WL-110
-		    Belkin F5D6060 (version 1 only)
-		    Buffalo AirStation
-		    D-Link DCF-660W
-		    ELSA XI800
-		    Linksys WCF12
-		    Netgear MA701
-		    Pretec Compact WLAN OC-WLBXX-A
-		    Senao NL-2511CF
+		    Flash adapters (will be detected as PCMCIA adapters)
 		WaveLAN/IEEE, PRISM 2-3, and Spectrum24 IEEE 802.11b PCI
-		adapters
-		    3Com AirConnect 3CRWE777A
-		    Addtron AWA-100
-		    Belkin F5D6001 (version 1 only)
-		    Corega CGWLPCIA11
-		    D-Link DWL-520 (rev A and B only)
-		    Intersil Mini PCI
-		    Intersil ISL3872
-		    Longshine 8301
-		    NDC/Sohoware NCP130
-		    Netgear MA311
-		    Nortel E-mobility 211818-A
-		    Samsung MagicLAN SWL-2210P
-		    Senao NL-2511MP
-		    Symbol LA4123
+		    adapters
 		WaveLAN/IEEE, PRISM 2-3, and Spectrum24 IEEE 802.11b PCMCIA
-		adapters
-		    3Com AirConnect 3CRWE737A
-		    Actiontec HWC01170
-		    Adaptec AWN-8030
-		    Addtron AWP-100
-		    Agere ORiNOCO
-		    ARtem Onair
-		    ASUS SpaceLink WL-100
-		    Belkin F5D6020 (version 1 only)
-		    Buffalo AirStation
-		    Cabletron RoamAbout
-		    Compaq Agency NC5004
-		    Contec FLEXLAN/FX-DS110-PCC
-		    Corega PCC-11
-		    Corega PCCA-11
-		    Corega PCCB-11
-		    D-Link DWL-650 (rev A1-J3 only)
-		    ELSA XI300
-		    ELSA XI325
-		    ELSA XI325H
-		    EMTAC A2424i
-		    Ericsson Wireless LAN CARD C11
-		    Gemtek WL-311
-		    Hawking Technology WE110P
-		    I-O DATA WN-B11/PCM
-		    Intel PRO/Wireless 2011
-		    Intersil Prism II
-		    Linksys Instant Wireless WPC11
-		    Linksys Instant Wireless WPC11 2.5
-		    Linksys Instant Wireless WPC11 3.0
-		    Lucent WaveLAN
-		    Microsoft MN520
-		    NANOSPEED ROOT-RZ2000
-		    NEC CMZ-RT-WP
-		    Netgear MA401
-		    Netgear MA401RA
-		    Nokia C020 Wireless LAN
-		    Nokia C110/C111 Wireless LAN
-		    NTT-ME 11Mbps Wireless LAN
-		    Planex GW-NS11H
-		    Proxim Harmony
-		    Proxim RangeLAN-DS
-		    Samsung MagicLAN SWL-2000N
-		    Siemens SpeedStream SS1021
-		    SMC 2632 EZ Connect
-		    Symbol Spectrum24
-		    TDK LAK-CD011WL
-		    US Robotics 2410
-		    US Robotics 2445
+		    adapters
 		WaveLAN/IEEE, PRISM 2-3, and Spectrum24 IEEE 802.11b USB
-		adapters
-		    Acer Warplink USB-400
-		    Actiontec HWU01170
-		    AirVast WM168b
-		    Ambit WLAN
-		    Apacer Wireless Steno MB112
-		    ASUS WL-140
-		    Compaq W100
-		    Corega WLUSB-11
-		    Corega WLUSB-11 Key
-		    D-Link DWL-120 (rev F)
-		    D-Link DWL-122
-		    I-O DATA WN-B11/USB
-		    Intel PRO/Wireless 2011B
-		    Intersil Prism 2X
-		    JVC MP-XP7250
-		    Linksys WUSB11 v3.0
-		    Linksys WUSB12
-		    Melco WLI-USB-KB11
-		    Melco WLI-USB-KS11G
-		    Melco WLI-USB-S11
-		    Microsoft MN510
-		    Netgear MA111 (version 1 only)
-		    Pheenet WL-503IA
-		    Planex GW-US11H
-		    Siemens SpeedStream SS1022
-		    Sitecom WL-022
-		    Syntax USB-400
-		    US Robotics 1120
-		    ViewSonic Airsync
-		    Z-Com XI-725/726
-		    Z-Com XI-735
-		    ZyXEL ZyAIR B-200
+		    adapters
 		Xircom CreditCard Netwave PCMCIA adapters
 		ZyDAS ZD1211/ZD1211B USB IEEE 802.11b/g USB adapters
-		    3COM 3CRUSB10075
-		    Acer WLAN-G-US1
-		    Airlink+ AWLL3025
-		    Airlink 101 AWLL3026
-		    AOpen 802.11g WL54
-		    Asus A9T integrated wirless
-		    Asus WL-159g
-		    Belkin F5D7050 v.4000
-		    Billion BiPAC 3011G
-		    Buffalo WLI-U2-KG54L
-		    CC&C WL-2203B
-		    DrayTek Vigor 550
-		    Edimax EW-7317UG
-		    Edimax EW-7317LDG
-		    Fiberline Networks WL-43OU
-		    iNexQ UR055g
-		    Linksys WUSBF54G
-		    Longshine LCS-8131G3
-		    MSI US54SE
-		    Philips SNU5600
-		    Planet WL-U356
-		    Planex GW-US54GD
-		    Planex GW-US54GXS
-		    Planex GW-US54GZL
-		    Planex GW-US54Mini
-		    Safecom SWMULZ-5400
-		    Sagem XG 760A
-		    Sagem XG 76NA
-		    Sandberg Wireless G54 USB
-		    Sitecom WL-113
-		    Sitecom WL-603
-		    SMC SMCWUSB-G
-		    Sweex wireless USB 54 Mbps
-		    Tekram/Siemens USB adapter
-		    Telegent TG54USB
-		    Trendnet TEW-424UB
-		    Trendnet TEW-429UB
-		    TwinMOS G240
-		    US Robotics 5423
-		    X-Micro XWL-11GUZX
-		    Yakumo QuickWLAN USB
-		    Zonet ZEW2501
-		    ZyXEL G-202
-		    ZyXEL ZyAIR G-220
 	Gigabit Ethernet Adapters
 		Agere/LSI ET1310 based adapters
 		Alteon Tigon I/II PCI Gigabit Ethernet boards, including:
diff --git a/distrib/notes/armish/hardware b/distrib/notes/armish/hardware
index 8cf40d7eb71..d5d4dc54f92 100644
--- a/distrib/notes/armish/hardware
+++ b/distrib/notes/armish/hardware
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: hardware,v 1.8 2009/03/28 07:39:16 jmc Exp $
+dnl	$OpenBSD: hardware,v 1.9 2009/04/09 16:02:24 jsg Exp $
 dnl When more than one model is supported, turn this into a list...
 OpenBSD/MACHINE runs on the Thecus N2100 and IOData HDL-G models at the moment.
 
@@ -98,164 +98,10 @@ Supported devices {:-include-:}:
 		    Z-TEK ZK-R02
 	Wireless Ethernet Adapters
 		Atmel AT76C50x based USB IEEE 802.11b adapters
-		    3Com 3CRSHEW696
-		    AboCom BWU613
-		    Accton 2664W
-		    Acer Peripherals AWL300
-		    Acer Peripherals AWL400
-		    Actiontec 802UAT1
-		    Addtron AWU120
-		    Aincomm AWU2000B
-		    Askey Computer Voyager 1010
-		    Askey Computer WLL013 (Intersil Radio)
-		    Askey Computer WLL013 (RFMD Radio)
-		    Belkin F5D6050
-		    Bluetake BW002
-		    Compaq iPAQ h54xx/h55xx Internal WLAN
-		    Conceptronic C11U
-		    Conceptronic WL210
-		    Corega WLAN USB Stick 11
-		    Dick Smith Electronics CHUSB 611G
-		    Dick Smith Electronics WL200U
-		    Dick Smith Electronics WL240U
-		    Dick Smith Electronics XH1153
-		    D-Link DWL-120 rev E
-		    Geowave GW-US11S
-		    Gigabyte GN-WLBM101
-		    Gigaset WLAN
-		    Hewlett-Packard HN210W
-		    Intel AP310 AnyPoint II
-		    I/O DATA USB WN-B11
-		    Lexar 2662W-AR
-		    Linksys WUSB11
-		    Linksys WUSB11 v2.8
-		    MSI WLAN
-		    Netgear MA101
-		    Netgear MA101 rev B
-		    Ovislink AirLive WL-1120USB
-		    OvisLink AirLive WL-1130USB
-		    Planex Communications GW-US11S
-		    Samsung SWL2100W
-		    Siemens WLL013
-		    SMC 2662W-AR
-		    SMC 2662W-V4
-		    Tekram U-300C
-		    Z-Com M4Y-750
 		Intersil PRISM 2.5/3 based USB IEEE 802.11b adapters
-		    Acer Warplink USB-400
-		    Actiontec HWU01170
-		    AirVast WM168b
-		    Ambit WLAN
-		    Apacer Wireless Steno MB112
-		    ASUS WL-140
-		    Compaq W100
-		    Corega WLUSB-11
-		    Corega WLUSB-11 Key
-		    D-Link DWL-120 (rev F)
-		    D-Link DWL-122
-		    I-O DATA WN-B11/USB
-		    Intel PRO/Wireless 2011B
-		    Intersil Prism 2X
-		    JVC MP-XP7250
-		    Linksys WUSB11 v3.0
-		    Linksys WUSB12
-		    Melco WLI-USB-KB11
-		    Melco WLI-USB-KS11G
-		    Melco WLI-USB-S11
-		    Microsoft MN510
-		    Netgear MA111 (version 1)
-		    Pheenet WL-503IA
-		    Planex GW-US11H
-		    Siemens SpeedStream SS1022
-		    Sitecom WL-022
-		    Syntax USB-400
-		    US Robotics 1120
-		    ViewSonic Airsync
-		    Z-Com XI-725/726
-		    Z-Com XI-735
-		    ZyXEL ZyAIR B-200
 		Ralink RT2500 based USB 2.0 IEEE 802.11b/g adapters
-		    AMIT WL532U
-		    ASUS WL-167g
-		    Belkin F5D7050
-		    Buffalo WLI-U2-KG54
-		    Buffalo WLI-U2-KG54-AI
-		    Buffalo WLI-U2-KG54-YB
-		    CNet CWD-854
-		    Compex WLU54G
-		    Conceptronic C54RU
-		    D-Link DWL-G122 (b1)
-		    Dynalink WLG25USB
-		    E-Tech WGUS02
-		    Eminent 3035
-		    Gigabyte GN-WBKG
-		    Hercules HWGUSB2-54
-		    KCORP LifeStyle KLS-685
-		    Linksys WUSB54G v4
-		    Linksys WUSB54GP v4
-		    MSI MS-6861
-		    MSI MS-6865
-		    MSI MS-6869
-		    SerComm UB801R
-		    SparkLAN WL-685R
-		    Sphairon UB801R
-		    Surecom EP-9001-g rev 3A
-		    Tonze UW-6200C
-		    Zaapa ZNWUSB-54
-		    Zinwell ZWX-G261
-		    Zonet ZEW2500P
 		Ralink RT2501USB/RT2601USB USB 2.0 IEEE 802.11/a/b/g adapters
-		    3Com Aolynk WUB320g
-		    Abocom WUG2700
-		    Airlink101 AWLL5025
-		    Belkin F5D7050 ver 3
-		    Belkin F5D9050 ver 3
-		    Buffalo WLI-U2-SG54HP
-		    Buffalo WLI-U2-G54HP
-		    CNet CWD-854 ver F
-		    Conceptronic C54RU ver 2
-		    Corega CG-WLUSB2GO
-		    D-Link DWL-G122 rev C1
-		    D-Link WUA-1340
-		    Digitus DN-7003GR
-		    Edimax EW-7318Ug
-		    Edimax EW-7318USg
-		    Edimax EW-7618Ug
-		    Gigabyte GN-WB01GS
-		    Hawking HWUG1
-		    Hawking HWU54DM
-		    Hercules HWGUSB2-54-LB
-		    Hercules HWGUSB2-54V2-AP
-		    LevelOne WNC-0301USB v3
-		    Linksys WUSB200
-		    Linksys WUSB54G rev C
-		    Linksys WUSB54GR
-		    Planex GW-US54HP
-		    Planex GW-US54Mini2
-		    Planex GW-USMM
-		    Senao NUB-3701
-		    Sitecom WL-113 ver 2
-		    Sitecom WL-172
-		    Sweex LW053
-		    TP-LINK TL-WN321G
 		Ralink Technology USB IEEE 802.11a/b/g/Draft-N USB adapters
-		    ASUS USB-N11
-		    ASUS WL-160N
-		    Belkin F5D8051 ver 3000
-		    Belkin F5D8053
-		    Buffalo WLI-UC-AG300N
-		    Buffalo WLI-UC-GN
-		    Corega CG-WLUSB300GNM
-		    D-Link DWA-130
-		    D-Link DWA-140
-		    Edimax EW-7711UAn
-		    Edimax EW-7717Un
-		    Edimax EW-7718Un
-		    Gigabyte GN-WB32L
-		    Linksys WUSB600N
-		    Planex GW-USMicroN
-		    Planex GW-US300MiniS
-
 	Serial ports
 		On-board serial (com) ports
 	Universal Serial Bus (USB) Devices
diff --git a/distrib/notes/hppa/hardware b/distrib/notes/hppa/hardware
index 66969b7bbd9..154a94400d2 100644
--- a/distrib/notes/hppa/hardware
+++ b/distrib/notes/hppa/hardware
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: hardware,v 1.41 2009/03/28 07:39:16 jmc Exp $
+dnl	$OpenBSD: hardware,v 1.42 2009/04/09 16:02:24 jsg Exp $
 OpenBSD/MACHINE OSREV runs on the following classes of HP9000 machines:
 - PA7000-based
 	705, 710, 720, 730, 750
@@ -129,246 +129,14 @@ Supported devices {:-include-:}:
 	HIL keyboard (hilkbd), mouse and tablets (hilms)
 - Wireless Ethernet Adapters
 	Aironet Communications 4500/4800 IEEE 802.11FH/b PCMCIA adapters
-	    Aironet 4500/4800
-	    Cisco 340/350
 	Atmel AT76C50x IEEE 802.11b USB adapters
-	    3Com 3CRSHEW696
-	    AboCom BWU613
-	    Accton 2664W
-	    Acer Peripherals AWL300
-	    Acer Peripherals AWL400
-	    Actiontec 802UAT1
-	    Addtron AWU120
-	    Aincomm AWU2000B
-	    Askey Computer Voyager 1010
-	    Askey Computer WLL013 (Intersil Radio)
-	    Askey Computer WLL013 (RFMD Radio)
-	    Atmel AT76C503 (Intersil Radio)
-	    Atmel AT76C503 (RFMD Radio)
-	    Atmel AT76C505 (RFMD Radio)
-	    Atmel AT76C505 (RFMD 2958 Radio)
-	    Atmel AT76C505A (RFMD 2958 Radio)
-	    Atmel AT76C505AS (RFMD 2958 Radio)
-	    Belkin F5D6050
-	    Bluetake BW002
-	    Compaq iPAQ h54xx/h55xx Internal WLAN
-	    Conceptronic C11U
-	    Conceptronic WL210
-	    Corega WLAN USB Stick 11
-	    Dick Smith Electronics CHUSB 611G
-	    Dick Smith Electronics WL200U
-	    Dick Smith Electronics WL240U
-	    Dick Smith Electronics XH1153
-	    D-Link DWL-120 rev E
-	    Geowave GW-US11S
-	    Gigabyte GN-WLBM101
-	    Gigaset WLAN
-	    Hewlett-Packard HN210W
-	    Intel AP310 AnyPoint II
-	    I/O DATA USB WN-B11
-	    Lexar 2662W-AR
-	    Linksys WUSB11 802.11b
-	    Linksys WUSB11 802.11b v2.8
-	    MSI WLAN
-	    Netgear MA101
-	    Netgear MA101 rev B
-	    OQO model 01 WiFi
-	    Ovislink AirLive WL-1120USB
-	    OvisLink AirLive WL-1130USB
-	    Planex Communications GW-US11S
-	    Samsung SWL2100W
-	    Siemens WLL013
-	    SMC EZ Connect 11Mbps (SMC2662w)
-	    SMC EZ Connect 11Mbps v2 (SMC2662wV2)
-	    Tekram U-300C
-	    TRENDnet TEW-229UB
-	    W-Buddie WN210
-	    Z-Com M4Y-750
 	Ralink Technology IEEE 802.11b/g USB adapters
-	    AMIT WL532U
-	    ASUS WL-167g
-	    Belkin F5D7050
-	    Buffalo WLI-U2-KG54
-	    Buffalo WLI-U2-KG54-AI
-	    Buffalo WLI-U2-KG54-YB
-	    CNet CWD-854
-	    Compex WLU54G
-	    Conceptronic C54RU
-	    D-Link DWL-G122 (b1)
-	    Dynalink WLG25USB
-	    E-Tech WGUS02
-	    Eminent 3035
-	    Gigabyte GN-WBKG
-	    Hercules HWGUSB2-54
-	    KCORP LifeStyle KLS-685
-	    Linksys WUSB54G v4
-	    Linksys WUSB54GP v4
-	    MSI MS-6861
-	    MSI MS-6865
-	    MSI MS-6869
-	    Nintendo Wi-Fi USB Connector
-	    Nova Tech NV-902W
-	    OvisLink Evo-W54USB
-	    SerComm UB801R
-	    SparkLAN WL-685R
-	    Sphairon UB801R
-	    Surecom EP-9001-g rev 3A
-	    Sweex LC100060
-	    Tonze UW-6200C
-	    Zaapa ZNWUSB-54
-	    Zinwell ZPlus-G250
-	    Zinwell ZWX-G261
-	    Zonet ZEW2500
 	Ralink Technology USB IEEE 802.11a/b/g USB adapters
-	    3Com Aolynk WUB320g
-	    Abocom WUG2700
-	    Airlink101 AWLL5025
-	    ASUS WL-167g ver 2
-	    Atlantis Land A02-UP1-W54
-	    Belkin F5D7050 ver 3
-	    Belkin F5D9050 ver 3
-	    Buffalo WLI-U2-SG54HP
-	    Buffalo WLI-U2-G54HP
-	    CNet CWD-854 ver F
-	    Conceptronic C54RU ver 2
-	    Corega CG-WLUSB2GL
-	    Corega CG-WLUSB2GO
-	    Corega CG-WLUSB2GPX
-	    D-Link DWL-G122 rev C1
-	    D-Link WUA-1340
-	    Digitus DN-7003GR
-	    Edimax EW-7318Ug
-	    Edimax EW-7318USg
-	    Edimax EW-7618Ug
-	    Gigabyte GN-WB01GS
-	    Gigabyte GN-WI05GS
-	    Hawking HWUG1
-	    Hawking HWU54DM
-	    Hercules HWGUSB2-54-LB
-	    Hercules HWGUSB2-54V2-AP
-	    LevelOne WNC-0301USB v3
-	    Linksys WUSB200
-	    Linksys WUSB54G rev C
-	    Linksys WUSB54GR
-	    Planex GW-US54HP
-	    Planex GW-US54Mini2
-	    Planex GW-USMM
-	    Senao NUB-3701
-	    Sitecom WL-113 ver 2
-	    Sitecom WL-172
-	    Sweex LW053
-	    TP-LINK TL-WN321G
 	Ralink Technology USB IEEE 802.11a/b/g/Draft-N USB adapters
-	    ASUS USB-N11
-	    ASUS WL-160N
-	    Belkin F5D8051 ver 3000
-	    Belkin F5D8053
-	    Buffalo WLI-UC-AG300N
-	    Buffalo WLI-UC-GN
-	    Corega CG-WLUSB300GNM
-	    D-Link DWA-130
-	    D-Link DWA-140
-	    Edimax EW-7711UAn
-	    Edimax EW-7717Un
-	    Edimax EW-7718Un
-	    Gigabyte GN-WB32L
-	    Linksys WUSB600N
-	    Planex GW-USMicroN
-	    Planex GW-US300MiniS
 	WaveLAN/IEEE, PRISM 2-3, and Spectrum24 IEEE 802.11b Compact Flash
-	adapters (will be detected as PCMCIA adapters)
-	    AmbiCom WL1100C-CF
-	    ASUS SpaceLink WL-110
-	    Belkin F5D6060 (version 1 only)
-	    Buffalo AirStation
-	    D-Link DCF-660W
-	    ELSA XI800
-	    Linksys WCF12
-	    Netgear MA701
-	    Pretec Compact WLAN OC-WLBXX-A
-	    Senao NL-2511CF
+	    adapters (will be detected as PCMCIA adapters)
 	WaveLAN/IEEE, PRISM 2-3, and Spectrum24 IEEE 802.11b PCMCIA adapters
-	    3Com AirConnect 3CRWE737A
-	    Actiontec HWC01170
-	    Adaptec AWN-8030
-	    Addtron AWP-100
-	    Agere ORiNOCO
-	    ARtem Onair
-	    ASUS SpaceLink WL-100
-	    Belkin F5D6020 (version 1 only)
-	    Buffalo AirStation
-	    Cabletron RoamAbout
-	    Compaq Agency NC5004
-	    Contec FLEXLAN/FX-DS110-PCC
-	    Corega PCC-11
-	    Corega PCCA-11
-	    Corega PCCB-11
-	    D-Link DWL-650 (rev A1-J3 only)
-	    ELSA XI300
-	    ELSA XI325
-	    ELSA XI325H
-	    EMTAC A2424i
-	    Ericsson Wireless LAN CARD C11
-	    Gemtek WL-311
-	    Hawking Technology WE110P
-	    I-O DATA WN-B11/PCM
-	    Intel PRO/Wireless 2011
-	    Intersil Prism II
-	    Linksys Instant Wireless WPC11
-	    Linksys Instant Wireless WPC11 2.5
-	    Linksys Instant Wireless WPC11 3.0
-	    Lucent WaveLAN
-	    Microsoft MN520
-	    NANOSPEED ROOT-RZ2000
-	    NEC CMZ-RT-WP
-	    Netgear MA401
-	    Netgear MA401RA
-	    Nokia C020 Wireless LAN
-	    Nokia C110/C111 Wireless LAN
-	    NTT-ME 11Mbps Wireless LAN
-	    Planex GW-NS11H
-	    Proxim Harmony
-	    Proxim RangeLAN-DS
-	    Samsung MagicLAN SWL-2000N
-	    Siemens SpeedStream SS1021
-	    SMC 2632 EZ Connect
-	    Symbol Spectrum24
-	    TDK LAK-CD011WL
-	    US Robotics 2410
-	    US Robotics 2445
 	WaveLAN/IEEE, PRISM 2-3, and Spectrum24 IEEE 802.11b USB adapters
-	    Acer Warplink USB-400
-	    Actiontec HWU01170
-	    AirVast WM168b
-	    Ambit WLAN
-	    Apacer Wireless Steno MB112
-	    ASUS WL-140
-	    Compaq W100
-	    Corega WLUSB-11
-	    Corega WLUSB-11 Key
-	    D-Link DWL-120 (rev F)
-	    D-Link DWL-122
-	    I-O DATA WN-B11/USB
-	    Intel PRO/Wireless 2011B
-	    Intersil Prism 2X
-	    JVC MP-XP7250
-	    Linksys WUSB11 v3.0
-	    Linksys WUSB12
-	    Melco WLI-USB-KB11
-	    Melco WLI-USB-KS11G
-	    Melco WLI-USB-S11
-	    Microsoft MN510
-	    Netgear MA111 (version 1 only)
-	    Pheenet WL-503IA
-	    Planex GW-US11H
-	    Siemens SpeedStream SS1022
-	    Sitecom WL-022
-	    Syntax USB-400
-	    US Robotics 1120
-	    ViewSonic Airsync
-	    Z-Com XI-725/726
-	    Z-Com XI-735
-	    ZyXEL ZyAIR B-200
 - PC Cards (PCMCIA and CardBus)
 	ATA cards, including:
 	    ATA/IDE card drives
diff --git a/distrib/notes/i386/hardware b/distrib/notes/i386/hardware
index f68f9133113..a7a91b616aa 100644
--- a/distrib/notes/i386/hardware
+++ b/distrib/notes/i386/hardware
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: hardware,v 1.280 2009/03/28 07:39:16 jmc Exp $
+dnl	$OpenBSD: hardware,v 1.281 2009/04/09 16:02:24 jsg Exp $
 OpenBSD/MACHINE OSREV works across a broad range of standard PCs and
 clones, with a wide variety of processors and I/O bus architectures.  It
 can be expected to install and run with minimal difficulties on most
@@ -574,612 +574,50 @@ dnl		XR16850-based ports (only in the pccom driver)
 		    TRENDnet TE100-PCIE
 		    Compex RL100-ATX 10/100baseTX
 	Wireless Ethernet Adapters
-		ADMtek ADM8211 IEEE 802.11b CardBus adapters [A] [B] [C]
-		    3Com OfficeConnect 3CRSHPW796
-		    Blitz NetWave Point
-		    D-Link DWL-650 Rev. L1
-		    SMC 2635W (version 1 only)
-		    TRENDnet TEW-221PC
-		ADMtek ADM8211 IEEE 802.11b PCI adapters [A] [B] [C]
-		    Belkin F5D6001
-		    D-Link DWL-520 Rev. C1
-		    LanReady WP2000
-		    Xterasys XN2511B
+		ADMtek ADM8211 IEEE 802.11b PCI/CardBus adapters [A] [B] [C]
 		Aironet Communications 4500/4800 IEEE 802.11FH/b ISA PnP, PCI,
-		and PCMCIA adapters [A] [B] [C]
-		    Aironet 4500/4800
-		    Cisco 340/350
+		    and PCMCIA adapters [A] [B] [C]
 		Atheros IEEE 802.11a/b/g CardBus adapters [A] [B]
-		    3Com 3CRPAG175
-		    Cisco AIR-CB21AG
-		    D-Link DWL-A650
-		    D-Link DWL-AB650
-		    Elecom LD-WL54
-		    Linksys WPC51AB
-		    Netgear WAB501
-		    Planet WL-3560
-		    Proxim Skyline 4030
-		    SMC SMC2735W
-		    Sony PCWA-C500
 		Atheros IEEE 802.11a/b/g PCI adapters [A] [B]
-		    D-Link DWL-A520
-		    IBM 11ABG WL LAN Mini PCI
-		    Proxim Skyline 4032
-		    Senao NL-5354MP Mini PCI
-		    Wistron CM9 Mini PCI
 		Atheros USB IEEE 802.11a/b/g USB adapters [G]
-		    Compex WLU108AG
-		    Compex WLU108G
-		    D-Link DWL-G132
-		    IODATA WN-G54/US
-		    MELCO WLI-U2-KAMG54
-		    Netgear WG111T
-		    Netgear WG111U
-		    Netgear WPN111
-		    Olitec 000544
-		    Philips SNU6500
-		    PLANET WDL-U357
-		    Siemens Gigaset 108
-		    SMC SMCWUSBT-G
-		    SMC SMCWUSBT-G2
-		    SparkLAN WL-785A
-		    TP-Link TL-WN620G
-		    TRENDware International TEW-444UB
-		    TRENDware International TEW-504UB
-		    Unex Technology UR054ag
-		    ZyXEL XtremeMIMO M-202
 		Atheros USB IEEE 802.11a/b/g/Draft-N USB adapters [G]
-		    Arcadyan WN7512
-		    AVM FRITZ!WLAN USB Stick N
-		    CACE AirPcap Nx
-		    D-Link DWA-160A
-		    IO-Data WN-GDN/US2
-		    Netgear WNDA3100
-		    Netgear WN111 v2
-		    Planex GW-US300
-		    TP-Link TL-WN821N
-		    Ubiquiti SR71 USB
-		    Z-Com UB81
-		    Z-Com UB82
 		Atmel AT76C50x IEEE 802.11b USB adapters [G]
-		    3Com 3CRSHEW696
-		    AboCom BWU613
-		    Accton 2664W
-		    Acer Peripherals AWL300
-		    Acer Peripherals AWL400
-		    Actiontec 802UAT1
-		    Addtron AWU120
-		    Aincomm AWU2000B
-		    Askey Computer Voyager 1010
-		    Askey Computer WLL013 (Intersil Radio)
-		    Askey Computer WLL013 (RFMD Radio)
-		    Atmel AT76C503 (Intersil Radio)
-		    Atmel AT76C503 (RFMD Radio)
-		    Atmel AT76C505 (RFMD Radio)
-		    Atmel AT76C505 (RFMD 2958 Radio)
-		    Atmel AT76C505A (RFMD 2958 Radio)
-		    Atmel AT76C505AS (RFMD 2958 Radio)
-		    Belkin F5D6050
-		    Bluetake BW002
-		    Compaq iPAQ h54xx/h55xx Internal WLAN
-		    Conceptronic C11U
-		    Conceptronic WL210
-		    Corega WLAN USB Stick 11
-		    Dick Smith Electronics CHUSB 611G
-		    Dick Smith Electronics WL200U
-		    Dick Smith Electronics WL240U
-		    Dick Smith Electronics XH1153
-		    D-Link DWL-120 rev E
-		    Geowave GW-US11S
-		    Gigabyte GN-WLBM101
-		    Gigaset WLAN
-		    Hewlett-Packard HN210W
-		    Intel AP310 AnyPoint II
-		    I/O DATA USB WN-B11
-		    Lexar 2662W-AR
-		    Linksys WUSB11 802.11b
-		    Linksys WUSB11 802.11b v2.8
-		    MSI WLAN
-		    Netgear MA101
-		    Netgear MA101 rev B
-		    OQO model 01 WiFi
-		    Ovislink AirLive WL-1120USB
-		    OvisLink AirLive WL-1130USB
-		    Planex Communications GW-US11S
-		    Samsung SWL2100W
-		    Siemens WLL013
-		    SMC EZ Connect 11Mbps (SMC2662w)
-		    SMC EZ Connect 11Mbps v2 (SMC2662wV2)
-		    Tekram U-300C
-		    TRENDnet TEW-229UB
-		    W-Buddie WN210
-		    Z-Com M4Y-750
-		 Broadcom AirForce IEEE 802.11b/g CardBus adapters [G]
-		    Buffalo WLI-CB-G54
-		    Linksys WPC54G Ver 3
-		    Linksys WPC54GS Ver 2
-		    TRENDnet TEW-401PCplus
-		    US Robotics 5411
-		 Broadcom AirForce IEEE 802.11b/g PCI adapters [G]
-		    Apple Airport Extreme BCM4306
-		    Apple Airport Extreme BCM4318
-		    ASUS WL-138g
-		    Buffalo WLI-CB-G54
-		    Compaq R4035 onboard
-		    HP nx6125
-		    Linksys WPC54G Ver 3
-		    Linksys WPC54GS Ver 2
-		    TRENDnet TEW-401PCplus
-		    US Robotics 5411
+		Broadcom AirForce IEEE 802.11b/g CardBus adapters [G]
+		Broadcom AirForce IEEE 802.11b/g PCI adapters [G]
 		Conexant/Intersil Prism GT Full-MAC IEEE 802.11a/b/g CardBus
-		adapters [G]
-		    3COM 3CRWE154G72
-		    some NETGEAR WG511 (those made in Taiwan, NOT in China)
-		    SMC EZ Connect g 2.4GHz SMC2835W-v2
-		    Soyo Aerielink
-		    ZyXEL ZyAIR G-100
+		    adapters [G]
 		Conexant/Intersil Prism GT Full-MAC IEEE 802.11a/b/g PCI
-		adapters [G]
-		    D-Link DWL-g650 A1
-		    I-O Data WN-G54/CB
-		    I4 Z-Com XG-600
-		    I4 Z-Com XG-900
-		    Intersil PRISM Indigo
-		    Intersil PRISM Duette
-		    PLANEX GW-DS54G
-		    SMC EZ Connect g 2.4GHz SMC2802W
-		    SMC 2802Wv2
+		    adapters [G]
 		Conexant/Intersil PrismGT SoftMAC IEEE 802.11b/g USB adapters
-		[A] [B] [C]
-		    Belkin F5D7050 (version 1000)
-		    Cohiba Proto Board
-		    D-Link DWL-G120 Cohiba
-		    D-Link DWL-G122 rev A2
-		    FSC Connect2Air E-5400 USB D1700
-		    Gigaset USB Adapter 54
-		    Inventel UR045G
-		    IOGear GWU513
-		    Linksys WUSB54AG
-		    Linksys WUSB54G ver 2
-		    Medion MD40900
-		    Philips CPWUA054
-		    SMC EZ ConnectG SMC2862W-G
-		    Sagem XG703A
-		    Spinnaker DUT
-		    Spinnaker Proto Board
-		    Thomson SpeedTouch 121g
+		    [A] [B] [C]
 		Intel PRO/Wireless 2100 IEEE 802.11b PCI adapters [G]
 		Intel PRO/Wireless 2200BG/2225BG/2915ABG 802.11a/b/g PCI
-		adapters [G]
+		    adapters [G]
 		Intel PRO/Wireless 3945ABG IEEE 802.11a/b/g PCI adapters [G]
 		Intel Wireless WiFi Link 4965AGN IEEE 802.11a/b/g/Draft-N
-		adapters [G]
-		Marvell Libertas IEEE 802.11b/g CardBus adapters [G]
-		    Netgear WG511v2
-		    Tenda TWL541C
-		Marvell Libertas IEEE 802.11b/g PCI adapters [G]
-		    Netgear WG311v3
-		    Tenda TWL542P
+		    adapters [G]
+		Marvell Libertas IEEE 802.11b/g PCI/CardBus adapters [G]
 		Marvell Libertas IEEE 802.11b/g Compact Flash adapters (will be
-		detected as PCMCIA adapters) [G]
-		    Ambicom WL54CF
-		    I-O DATA WN-G54/CF
-		    SparkLAN WCFM-100
+		    detected as PCMCIA adapters) [G]
 		Ralink Technology IEEE 802.11a/b/g CardBus adapters [A] [B]
-		    A-Link WL54PC
-		    Alfa AWPC036
-		    Amigo AWI-914W
-		    AMIT WL531C
-		    ASUS WL-107G
-		    Atlantis Land A02-PCM-W54
-		    Belkin F5D7010 v2
-		    Canyon CN-WF513
-		    CC&C WL-2102
-		    CNet CWC-854
-		    Compex WL54G
-		    Conceptronic C54RC
-		    Corega CG-WLCB54GL
-		    Digiconnect WL591C
-		    Digitus DN-7001G-RA
-		    E-Tech WGPC02
-		    E-Tech WGPC03
-		    Edimax EW-7108PCg
-		    Eminent EM3036
-		    Encore ENPWI-G-RLAM
-		    Eusso UGL2454-01R
-		    Fibreline WL-400X
-		    Gigabyte GN-WMKG
-		    Gigabyte GN-WM01GS
-		    Gigabyte GN-WM01GM
-		    Hawking HWC54GR
-		    Hercules HWGPCMCIA-54
-		    JAHT WN-4054P
-		    KCORP LifeStyle KLS-611
-		    LevelOne WPC-0301 v2
-		    Micronet SP908GK V3
-		    Minitar MN54GCB-R
-		    MSI CB54G2
-		    MSI MS-6835
-		    Pro-Nets CB80211G
-		    Repotec RP-WB7108
-		    SATech SN-54C
-		    Sitecom WL-112
-		    SparkLAN WL-611R
-		    SparkLAN WPCR-501
-		    Surecom EP-9428-g
-		    Sweex LC500050
-		    TekComm NE-9428-g
-		    Tonze PW-6200C
-		    Unex MR054g-R02
-		    Zinwell ZWX-G160
-		    Zonet ZEW1500
 		Ralink Technology IEEE 802.11a/b/g PCI adapters [B] [C]
-		    A-Link WL54H
-		    AirLive WN-5000PCI
-		    Amigo AWI-922W Mini PCI
-		    Amigo AWI-926W
-		    AMIT WL531P
-		    AOpen AOI-831
-		    ASUS WL-130G
-		    ASUS WL-130N
-		    ASUS WIFI-G-AAY
-		    Atlantis Land A02-PCI-W54
-		    Belkin F5D7000 v3
-		    Billionton MIWLGRL Mini PCI
-		    Canyon CN-WF511
-		    CNet CWP-854
-		    Compex WLP54G
-		    Conceptronic C54Ri
-		    Digitus DN-7006G-RA
-		    Dynalink WLG25PCI
-		    E-Tech WGPI02
-		    Edimax EW-7128g
-		    Edimax EW-7628Ig
-		    Edimax EW-7728In
-		    Eminent EM3037
-		    Encore ENLWI-G-RLAM
-		    Eusso UGL2454-VPR
-		    Fiberline WL-400P
-		    Gigabyte GN-WIKG Mini PCI
-		    Gigabyte GN-WI01GS Mini PCI
-		    Gigabyte GN-WI02GM Mini PCI
-		    Gigabyte GN-WPKG
-		    Gigabyte GN-WP01GS
-		    Gigabyte GN-WI02GM
-		    Gigabyte GN-WP01GM
-		    Hawking HWP54GR
-		    Hercules HWGPCI-54
-		    iNexQ CR054g-009 (R03)
-		    JAHT WN-4054PCI
-		    KCORP LifeStyle KLS-660
-		    LevelOne WNC-0301 v2
-		    Linksys WMP54G v4
-		    Longshine LCS-8031N
-		    Micronet SP906GK
-		    Minitar MN54GPC-R
-		    MSI MP54G2 Mini PCI
-		    MSI MP6833 Mini PCI
-		    MSI MS-6834
-		    MSI PC54G2
-		    OvisLink EVO-W54PCI
-		    PheeNet HWL-PCIG/RA
-		    Planex PCI-GW-DS300N
-		    Pro-Nets PC80211G
-		    Repotec RP-WP0854
-		    SATech SN-54P
-		    Signamax 065-1798
-		    Sitecom WL-115
-		    SparkLAN WL-660R
-		    SparkLAN WMIR-215GN Mini PCI
-		    Surecom EP-9321-g
-		    Surecom EP-9321-g1
-		    Sweex LC700030
-		    TekComm NE-9321-g
-		    Tonze PC-620C Mini PCI
-		    Tonze PC-6200C
-		    Unex CR054g-R02
-		    Zinwell ZWX-G360 Mini PCI
-		    Zinwell ZWX-G361
-		    Zonet ZEW1600
 		Ralink Technology IEEE 802.11b/g USB adapters [A] [B] [C]
-		    AMIT WL532U
-		    ASUS WL-167g
-		    Belkin F5D7050
-		    Buffalo WLI-U2-KG54
-		    Buffalo WLI-U2-KG54-AI
-		    Buffalo WLI-U2-KG54-YB
-		    CNet CWD-854
-		    Compex WLU54G
-		    Conceptronic C54RU
-		    D-Link DWL-G122 (b1)
-		    Dynalink WLG25USB
-		    E-Tech WGUS02
-		    Eminent 3035
-		    Gigabyte GN-WBKG
-		    Hercules HWGUSB2-54
-		    KCORP LifeStyle KLS-685
-		    Linksys WUSB54G v4
-		    Linksys WUSB54GP v4
-		    MSI MS-6861
-		    MSI MS-6865
-		    MSI MS-6869
-		    Nintendo Wi-Fi USB Connector
-		    Nova Tech NV-902W
-		    OvisLink Evo-W54USB
-		    SerComm UB801R
-		    SparkLAN WL-685R
-		    Sphairon UB801R
-		    Surecom EP-9001-g rev 3A
-		    Sweex LC100060
-		    Tonze UW-6200C
-		    Zaapa ZNWUSB-54
-		    Zinwell ZPlus-G250
-		    Zinwell ZWX-G261
-		    Zonet ZEW2500
 		Ralink Technology USB IEEE 802.11a/b/g USB adapters [A] [B] [C]
-		    3Com Aolynk WUB320g
-		    Abocom WUG2700
-		    Airlink101 AWLL5025
-		    ASUS WL-167g ver 2
-		    Atlantis Land A02-UP1-W54
-		    Belkin F5D7050 ver 3
-		    Belkin F5D9050 ver 3
-		    Belkin F5D9050C
-		    Buffalo WLI-U2-SG54HP
-		    Buffalo WLI-U2-G54HP
-		    CNet CWD-854 ver F
-		    Conceptronic C54RU ver 2
-		    Corega CG-WLUSB2GL
-		    Corega CG-WLUSB2GO
-		    Corega CG-WLUSB2GPX
-		    D-Link DWA-110
-		    D-Link DWA-111
-		    D-Link DWL-G122 rev C1
-		    D-Link WUA-1340
-		    Digitus DN-7003GR
-		    Edimax EW-7318Ug
-		    Edimax EW-7318USg
-		    Edimax EW-7618Ug
-		    Gigabyte GN-WB01GS
-		    Gigabyte GN-WI05GS
-		    Hawking HWUG1
-		    Hawking HWU54DM
-		    Hercules HWGUSB2-54-LB
-		    Hercules HWGUSB2-54V2-AP
-		    LevelOne WNC-0301USB v3
-		    Linksys WUSB200
-		    Linksys WUSB54G rev C
-		    Linksys WUSB54GR
-		    Planex GW-US54HP
-		    Planex GW-US54Mini2
-		    Planex GW-USMM
-		    Senao NUB-3701
-		    Sitecom WL-113 ver 2
-		    Sitecom WL-172
-		    Sweex LW053
-		    TP-LINK TL-WN321G
 		Ralink Technology USB IEEE 802.11a/b/g/Draft-N USB adapters
-		[A] [B] [C]
-	    	    ASUS USB-N11
-		    ASUS WL-160N
-		    Belkin F5D8051 ver 3000
-		    Belkin F5D8053
-		    Buffalo WLI-UC-AG300N
-		    Buffalo WLI-UC-GN
-		    Corega CG-WLUSB300GNM
-		    D-Link DWA-130
-		    D-Link DWA-140
-		    Edimax EW-7711UAn
-		    Edimax EW-7717Un
-		    Edimax EW-7718Un
-		    Gigabyte GN-WB32L
-		    Linksys WUSB600N
-		    Planex GW-USMicroN
-		    Planex GW-US300MiniS
+		    [A] [B] [C]
 		Raytheon Raylink/WebGear Aviator IEEE 802.11FH PCMCIA adapters
-		[A] [B] [C]
-		    Raytheon Raylink WLAN
-		    WebGear Aviator 2.4
-		    WebGear Aviator PRO
+		    [A] [B] [C]
 		Realtek RTL8180L IEEE 802.11b CardBus adapters [A] [B] [C]
-		    Allnet ALL0182
-		    Belkin F5D6020 V3
-		    Buffalo WLI-CB-B11
-		    Corega CG-WLCB11V3
-		    D-Link DWL-610
-		    Edimax EW-7106
-		    GigaFast WF721-AEX (R* serial)
-		    Jensen AirLink 6011
-		    Level-One WPC-0101
-		    Linksys WPC11 v4
-		    Netgear MA521
-		    Ovislink AirLive WL-1120PCM
-		    Planet WL-3553
-		    Q-Tec 770WC
-		    Q-Tec 775WC
-		    Roper FreeLan 802.11b
-		    SAFECOM SWLCR-1100
-		    TRENDnet TEW-226PC
-		    VCTnet PC-11B1
-		    Winstron CB-200B
-		    Zonet ZEW1000
-		TI ACX100/ACX111 IEEE 802.11a/b/g CardBus adapters [G]
-		    D-Link DWL-650+
-		    D-Link DWL-G630+
-		    D-Link DWL-G650+
-		    Ergenic ERG WL-003
-		    Hamlet HNWP254
-		    Linksys WPC54Gv2
-		    Microcom Travelcard
-		    Sceptre SC254W+
-		    USR USR5410
-		    ZyXEL G-160
-		TI ACX100/ACX111 IEEE 802.11a/b/g PCI adapters [G]
-		    D-Link DWL-520+
-		    D-Link DWL-G520+
-		    Hawking HWP54G
-		    Netgear WG311v2
-		    Tornado/ADT 211g
-		    USR USR5416
-		    ZyXEL G-360 EE
+		TI ACX100/ACX111 IEEE 802.11a/b/g PCI/CardBus adapters [G]
 		WaveLAN/IEEE, PRISM 2-3, and Spectrum24 IEEE 802.11b Compact
-		Flash adapters (will be detected as PCMCIA adapters) [B]
-		    AmbiCom WL1100C-CF
-		    ASUS SpaceLink WL-110
-		    Belkin F5D6060 (version 1 only)
-		    Buffalo AirStation
-		    D-Link DCF-660W
-		    ELSA XI800
-		    Linksys WCF12
-		    Netgear MA701
-		    Pretec Compact WLAN OC-WLBXX-A
-		    Senao NL-2511CF
+		    Flash adapters (will be detected as PCMCIA adapters) [B]
 		WaveLAN/IEEE, PRISM 2-3, and Spectrum24 IEEE 802.11b PCI
-		adapters [C]
-		    3Com AirConnect 3CRWE777A
-		    Addtron AWA-100
-		    Belkin F5D6001 (version 1 only)
-		    Corega CGWLPCIA11
-		    D-Link DWL-520 (rev A and B only)
-		    Intersil Mini PCI
-		    Intersil ISL3872
-		    Longshine 8301
-		    NDC/Sohoware NCP130
-		    Netgear MA311
-		    Nortel E-mobility 211818-A
-		    Samsung MagicLAN SWL-2210P
-		    Senao NL-2511MP
-		    Symbol LA4123
+		    adapters [C]
 		WaveLAN/IEEE, PRISM 2-3, and Spectrum24 IEEE 802.11b PCMCIA
-		adapters [B]
-		    3Com AirConnect 3CRWE737A
-		    Actiontec HWC01170
-		    Adaptec AWN-8030
-		    Addtron AWP-100
-		    Agere ORiNOCO
-		    ARtem Onair
-		    ASUS SpaceLink WL-100
-		    Belkin F5D6020 (version 1 only)
-		    Buffalo AirStation
-		    Cabletron RoamAbout
-		    Compaq Agency NC5004
-		    Contec FLEXLAN/FX-DS110-PCC
-		    Corega PCC-11
-		    Corega PCCA-11
-		    Corega PCCB-11
-		    D-Link DWL-650 (rev A1-J3 only)
-		    ELSA XI300
-		    ELSA XI325
-		    ELSA XI325H
-		    EMTAC A2424i
-		    Ericsson Wireless LAN CARD C11
-		    Gemtek WL-311
-		    Hawking Technology WE110P
-		    I-O DATA WN-B11/PCM
-		    Intel PRO/Wireless 2011
-		    Intersil Prism II
-		    Linksys Instant Wireless WPC11
-		    Linksys Instant Wireless WPC11 2.5
-		    Linksys Instant Wireless WPC11 3.0
-		    Lucent WaveLAN
-		    Microsoft MN520
-		    NANOSPEED ROOT-RZ2000
-		    NEC CMZ-RT-WP
-		    Netgear MA401
-		    Netgear MA401RA
-		    Nokia C020 Wireless LAN
-		    Nokia C110/C111 Wireless LAN
-		    NTT-ME 11Mbps Wireless LAN
-		    Planex GW-NS11H
-		    Proxim Harmony
-		    Proxim RangeLAN-DS
-		    Samsung MagicLAN SWL-2000N
-		    Siemens SpeedStream SS1021
-		    SMC 2632 EZ Connect
-		    Symbol Spectrum24
-		    TDK LAK-CD011WL
-		    US Robotics 2410
-		    US Robotics 2445
+		    adapters [B]
 		WaveLAN/IEEE, PRISM 2-3, and Spectrum24 IEEE 802.11b USB
-		adapters [A] [B]
-		    Acer Warplink USB-400
-		    Actiontec HWU01170
-		    AirVast WM168b
-		    Ambit WLAN
-		    Apacer Wireless Steno MB112
-		    ASUS WL-140
-		    Compaq W100
-		    Corega WLUSB-11
-		    Corega WLUSB-11 Key
-		    D-Link DWL-120 (rev F)
-		    D-Link DWL-122
-		    I-O DATA WN-B11/USB
-		    Intel PRO/Wireless 2011B
-		    Intersil Prism 2X
-		    JVC MP-XP7250
-		    Linksys WUSB11 v3.0
-		    Linksys WUSB12
-		    Melco WLI-USB-KB11
-		    Melco WLI-USB-KS11G
-		    Melco WLI-USB-S11
-		    Microsoft MN510
-		    Netgear MA111 (version 1 only)
-		    Pheenet WL-503IA
-		    Planex GW-US11H
-		    Siemens SpeedStream SS1022
-		    Sitecom WL-022
-		    Syntax USB-400
-		    US Robotics 1120
-		    ViewSonic Airsync
-		    Z-Com XI-725/726
-		    Z-Com XI-735
-		    ZyXEL ZyAIR B-200
+		    adapters [A] [B]
 		ZyDAS ZD1211/ZD1211B USB IEEE 802.11b/g USB adapters [G]
-		    3COM 3CRUSB10075
-		    Acer WLAN-G-US1
-		    Airlink+ AWLL3025
-		    Airlink 101 AWLL3026
-		    AOpen 802.11g WL54
-		    Asus A9T integrated wirless
-		    Asus WL-159g
-		    Belkin F5D7050 v.4000
-		    Billion BiPAC 3011G
-		    Buffalo WLI-U2-KG54L
-		    CC&C WL-2203B
-		    DrayTek Vigor 550
-		    Edimax EW-7317UG
-		    Edimax EW-7317LDG
-		    Fiberline Networks WL-43OU
-		    iNexQ UR055g
-		    Linksys WUSBF54G
-		    Longshine LCS-8131G3
-		    MSI US54SE
-		    Philips SNU5600
-		    Planet WL-U356
-		    Planex GW-US54GD
-		    Planex GW-US54GXS
-		    Planex GW-US54GZL
-		    Planex GW-US54Mini
-		    Safecom SWMULZ-5400
-		    Sagem XG 760A
-		    Sagem XG 76NA
-		    Sandberg Wireless G54 USB
-		    Sitecom WL-113
-		    Sitecom WL-603
-		    SMC SMCWUSB-G
-		    Sweex wireless USB 54 Mbps
-		    Tekram/Siemens USB adapter
-		    Telegent TG54USB
-		    Trendnet TEW-424UB
-		    Trendnet TEW-429UB
-		    TwinMOS G240
-		    US Robotics 5423
-		    X-Micro XWL-11GUZX
-		    Yakumo QuickWLAN USB
-		    Zonet ZEW2501
-		    ZyXEL G-202
-		    ZyXEL ZyAIR G-220
-		
 	Gigabit Ethernet Adapters
 		Agere/LSI ET1310 based adapters [A] [B] [C]
 		Alteon Tigon I/II PCI Gigabit Ethernet boards, including: [A]
diff --git a/distrib/notes/landisk/hardware b/distrib/notes/landisk/hardware
index 2b4c86ad71b..459710934d9 100644
--- a/distrib/notes/landisk/hardware
+++ b/distrib/notes/landisk/hardware
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: hardware,v 1.8 2009/03/28 07:39:16 jmc Exp $
+dnl	$OpenBSD: hardware,v 1.9 2009/04/09 16:02:24 jsg Exp $
 OpenBSD/MACHINE runs on the following SH4-based IO-DATA made models:
 	IO-DATA USL-5P, using CF storage (Japan)
 	IO-DATA HDL-U, HDL-AV, HDL-W and HDLM-U series (Japan)
@@ -107,221 +107,12 @@ Supported devices {:-include-:}:
 		    Z-TEK ZK-R02
 	Wireless Ethernet Adapters
 		Atheros USB IEEE 802.11a/b/g adapters
-		    Compex WLU108AG
-		    Compex WLU108G
-		    D-Link DWL-G132
-		    Netgear WG111T
-		    Netgear WG111U
-		    Netgear WPN111
-		    Olitec 000544
-		    PLANET WDL-U357
-		    Siemens Gigaset 108
-		    SMC SMCWUSBT-G
-		    SparkLAN WL-785A
-		    TP-Link TL-WN620G
-		    TRENDware International TEW-444UB
-		    TRENDware International TEW-504UB
-		    Unex Technology UR054ag
-		    ZyXEL XtremeMIMO M-202
 		Atmel AT76C50x based USB IEEE 802.11b adapters
-		    3Com 3CRSHEW696
-		    AboCom BWU613
-		    Accton 2664W
-		    Acer Peripherals AWL300
-		    Acer Peripherals AWL400
-		    Actiontec 802UAT1
-		    Addtron AWU120
-		    Aincomm AWU2000B
-		    Askey Computer Voyager 1010
-		    Askey Computer WLL013 (Intersil Radio)
-		    Askey Computer WLL013 (RFMD Radio)
-		    Belkin F5D6050
-		    Bluetake BW002
-		    Compaq iPAQ h54xx/h55xx Internal WLAN
-		    Conceptronic C11U
-		    Conceptronic WL210
-		    Corega WLAN USB Stick 11
-		    Dick Smith Electronics CHUSB 611G
-		    Dick Smith Electronics WL200U
-		    Dick Smith Electronics WL240U
-		    Dick Smith Electronics XH1153
-		    D-Link DWL-120 rev E
-		    Geowave GW-US11S
-		    Gigabyte GN-WLBM101
-		    Gigaset WLAN
-		    Hewlett-Packard HN210W
-		    Intel AP310 AnyPoint II
-		    I/O DATA USB WN-B11
-		    Lexar 2662W-AR
-		    Linksys WUSB11
-		    Linksys WUSB11 v2.8
-		    MSI WLAN
-		    Netgear MA101
-		    Netgear MA101 rev B
-		    Ovislink AirLive WL-1120USB
-		    OvisLink AirLive WL-1130USB
-		    Planex Communications GW-US11S
-		    Samsung SWL2100W
-		    Siemens WLL013
-		    SMC 2662W-AR
-		    SMC 2662W-V4
-		    Tekram U-300C
-		    Z-Com M4Y-750
 		Intersil PRISM 2.5/3 based USB IEEE 802.11b adapters
-		    Acer Warplink USB-400
-		    Actiontec HWU01170
-		    AirVast WM168b
-		    Ambit WLAN
-		    Apacer Wireless Steno MB112
-		    ASUS WL-140
-		    Compaq W100
-		    Corega WLUSB-11
-		    Corega WLUSB-11 Key
-		    D-Link DWL-120 (rev F)
-		    D-Link DWL-122
-		    I-O DATA WN-B11/USB
-		    Intel PRO/Wireless 2011B
-		    Intersil Prism 2X
-		    JVC MP-XP7250
-		    Linksys WUSB11 v3.0
-		    Linksys WUSB12
-		    Melco WLI-USB-KB11
-		    Melco WLI-USB-KS11G
-		    Melco WLI-USB-S11
-		    Microsoft MN510
-		    Netgear MA111 (version 1)
-		    Pheenet WL-503IA
-		    Planex GW-US11H
-		    Siemens SpeedStream SS1022
-		    Sitecom WL-022
-		    Syntax USB-400
-		    US Robotics 1120
-		    ViewSonic Airsync
-		    Z-Com XI-725/726
-		    Z-Com XI-735
-		    ZyXEL ZyAIR B-200
 		Ralink RT2500 based USB 2.0 IEEE 802.11b/g adapters
-		    AMIT WL532U
-		    ASUS WL-167g
-		    Belkin F5D7050
-		    Buffalo WLI-U2-KG54
-		    Buffalo WLI-U2-KG54-AI
-		    Buffalo WLI-U2-KG54-YB
-		    CNet CWD-854
-		    Compex WLU54G
-		    Conceptronic C54RU
-		    D-Link DWL-G122 (b1)
-		    Dynalink WLG25USB
-		    E-Tech WGUS02
-		    Eminent 3035
-		    Gigabyte GN-WBKG
-		    Hercules HWGUSB2-54
-		    KCORP LifeStyle KLS-685
-		    Linksys WUSB54G v4
-		    Linksys WUSB54GP v4
-		    MSI MS-6861
-		    MSI MS-6865
-		    MSI MS-6869
-		    SerComm UB801R
-		    SparkLAN WL-685R
-		    Sphairon UB801R
-		    Surecom EP-9001-g rev 3A
-		    Tonze UW-6200C
-		    Zaapa ZNWUSB-54
-		    Zinwell ZWX-G261
-		    Zonet ZEW2500P
 		Ralink RT2501USB/RT2601USB USB 2.0 IEEE 802.11/a/b/g adapters
-		    3Com Aolynk WUB320g
-		    Abocom WUG2700
-		    Airlink101 AWLL5025
-		    Belkin F5D7050 ver 3
-		    Belkin F5D9050 ver 3
-		    Buffalo WLI-U2-SG54HP
-		    Buffalo WLI-U2-G54HP
-		    CNet CWD-854 ver F
-		    Conceptronic C54RU ver 2
-		    Corega CG-WLUSB2GO
-		    D-Link DWL-G122 rev C1
-		    D-Link WUA-1340
-		    Digitus DN-7003GR
-		    Edimax EW-7318Ug
-		    Edimax EW-7318USg
-		    Edimax EW-7618Ug
-		    Gigabyte GN-WB01GS
-		    Hawking HWUG1
-		    Hawking HWU54DM
-		    Hercules HWGUSB2-54-LB
-		    Hercules HWGUSB2-54V2-AP
-		    LevelOne WNC-0301USB v3
-		    Linksys WUSB200
-		    Linksys WUSB54G rev C
-		    Linksys WUSB54GR
-		    Planex GW-US54HP
-		    Planex GW-US54Mini2
-		    Planex GW-USMM
-		    Senao NUB-3701
-		    Sitecom WL-113 ver 2
-		    Sitecom WL-172
-		    Sweex LW053
-		    TP-LINK TL-WN321G
 		Ralink Technology USB IEEE 802.11a/b/g/Draft-N USB adapters
-	    	    ASUS USB-N11
-		    ASUS WL-160N
-		    Belkin F5D8051 ver 3000
-		    Belkin F5D8053
-		    Buffalo WLI-UC-AG300N
-		    Buffalo WLI-UC-GN
-		    Corega CG-WLUSB300GNM
-		    D-Link DWA-130
-		    D-Link DWA-140
-		    Edimax EW-7711UAn
-		    Edimax EW-7717Un
-		    Edimax EW-7718Un
-		    Gigabyte GN-WB32L
-		    Linksys WUSB600N
-		    Planex GW-USMicroN
-		    Planex GW-US300MiniS
 		ZyDAS ZD1211/ZD1211B USB IEEE 802.11b/g adapters
-		    3COM 3CRUSB10075
-		    Acer WLAN-G-US1
-		    Airlink+ AWLL3025
-		    Airlink 101 AWLL3026
-		    AOpen 802.11g WL54
-		    Asus A9T integrated wirless
-		    Asus WL-159g
-		    Belkin F5D7050 v.4000
-		    Billion BiPAC 3011G
-		    Buffalo WLI-U2-KG54L
-		    CC&C WL-2203B
-		    DrayTek Vigor 550
-		    Edimax EW-7317UG
-		    Fiberline Networks WL-43OU
-		    iNexQ UR055g
-		    Linksys WUSBF54G
-		    Longshine LCS-8131G3
-		    MSI US54SE
-		    Philips SNU5600
-		    Planet WL-U356
-		    Planex GW-US54GZL
-		    Planex GW-US54Mini
-		    Safecom SWMULZ-5400
-		    Sagem XG 760A
-		    Sagem XG 76NA
-		    Sandberg Wireless G54 USB
-		    Sitecom  WL-113
-		    Sitecom WL-603
-		    SMC SMCWUSB-G
-		    Sweex wireless USB 54 Mbps
-		    Tekram/Siemens USB adapter
-		    Telegent TG54USB
-		    Trendnet TEW-424UB
-		    Trendnet TEW-429UB
-		    TwinMOS G240
-		    US Robotics 5423
-		    X-Micro XWL-11GUZX
-		    Yakumo QuickWLAN USB
-		    Zonet ZEW2501
-		    Zyxel ZyAIR G-220
 	Serial ports
 		On-board serial (scif) port
 	Universal Serial Bus (USB) Devices
diff --git a/distrib/notes/macppc/hardware b/distrib/notes/macppc/hardware
index c204d5e2883..e48adf7e59b 100644
--- a/distrib/notes/macppc/hardware
+++ b/distrib/notes/macppc/hardware
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: hardware,v 1.99 2009/03/28 07:39:16 jmc Exp $
+dnl	$OpenBSD: hardware,v 1.100 2009/04/09 16:02:24 jsg Exp $
 OpenBSD/MACHINE OSREV runs on iMac, G4 Power Macintosh, and G4 Cube, as well
 as PowerBook and iBook machines.
 
@@ -317,406 +317,29 @@ Supported devices {:-include-:}:
 
 	Wireless Ethernet Adapters
 		ADMtek ADM8211 IEEE 802.11b PCI adapters
-		    Belkin F5D6001
-		    D-Link DWL-520 Rev. C1
-		    LanReady WP2000
-		    Xterasys XN2511B
 		Aironet Communications 4500/4800 IEEE 802.11FH/b PCI and PCMCIA
-		adapters
-		    Aironet 4500/4800
-		    Cisco 340/350
+		    adapters
 		Atmel AT76C50x IEEE 802.11b USB adapters
-		    3Com 3CRSHEW696
-		    AboCom BWU613
-		    Accton 2664W
-		    Acer Peripherals AWL300
-		    Acer Peripherals AWL400
-		    Actiontec 802UAT1
-		    Addtron AWU120
-		    Aincomm AWU2000B
-		    Askey Computer Voyager 1010
-		    Askey Computer WLL013 (Intersil Radio)
-		    Askey Computer WLL013 (RFMD Radio)
-		    Atmel AT76C503 (Intersil Radio)
-		    Atmel AT76C503 (RFMD Radio)
-		    Atmel AT76C505 (RFMD Radio)
-		    Atmel AT76C505 (RFMD 2958 Radio)
-		    Atmel AT76C505A (RFMD 2958 Radio)
-		    Atmel AT76C505AS (RFMD 2958 Radio)
-		    Belkin F5D6050
-		    Bluetake BW002
-		    Compaq iPAQ h54xx/h55xx Internal WLAN
-		    Conceptronic C11U
-		    Conceptronic WL210
-		    Corega WLAN USB Stick 11
-		    Dick Smith Electronics CHUSB 611G
-		    Dick Smith Electronics WL200U
-		    Dick Smith Electronics WL240U
-		    Dick Smith Electronics XH1153
-		    D-Link DWL-120 rev E
-		    Geowave GW-US11S
-		    Gigabyte GN-WLBM101
-		    Gigaset WLAN
-		    Hewlett-Packard HN210W
-		    Intel AP310 AnyPoint II
-		    I/O DATA USB WN-B11
-		    Lexar 2662W-AR
-		    Linksys WUSB11 802.11b
-		    Linksys WUSB11 802.11b v2.8
-		    MSI WLAN
-		    Netgear MA101
-		    Netgear MA101 rev B
-		    OQO model 01 WiFi
-		    Ovislink AirLive WL-1120USB
-		    OvisLink AirLive WL-1130USB
-		    Planex Communications GW-US11S
-		    Samsung SWL2100W
-		    Siemens WLL013
-		    SMC EZ Connect 11Mbps (SMC2662w)
-		    SMC EZ Connect 11Mbps v2 (SMC2662wV2)
-		    Tekram U-300C
-		    TRENDnet TEW-229UB
-		    W-Buddie WN210
-		    Z-Com M4Y-750
-		 Broadcom AirForce IEEE 802.11b/g CardBus adapters
-		    Buffalo WLI-CB-G54
-		    Linksys WPC54G Ver 3
-		    Linksys WPC54GS Ver 2
-		    TRENDnet TEW-401PCplus
-		    US Robotics 5411
-		 Broadcom AirForce IEEE 802.11b/g PCI adapters
-		    Apple Airport Extreme BCM4306
-		    Apple Airport Extreme BCM4318
-		    ASUS WL-138g
-		    Compaq R4035 onboard
-		    HP nx6125
-		Marvell Libertas IEEE 802.11b/g CardBus adapters
-		    Netgear WG511v2
-		    Tenda TWL541C
-		Marvell Libertas IEEE 802.11b/g PCI adapters
-		    Netgear WG311v3
-		    Tenda TWL542P
+		Broadcom AirForce IEEE 802.11b/g PCI/CardBus adapters
+		Broadcom AirForce IEEE 802.11b/g PCI adapters
+		Marvell Libertas IEEE 802.11b/g PCI/CardBus adapters
 		Marvell Libertas IEEE 802.11b/g Compact Flash adapters (will be
-		detected as PCMCIA adapters)
-		    Ambicom WL54CF
-		    I-O DATA WN-G54/CF
-		    SparkLAN WCFM-100
+		    detected as PCMCIA adapters)
 		Ralink Technology IEEE 802.11a/b/g PCI adapters
-		    A-Link WL54H
-		    AirLive WN-5000PCI
-		    Amigo AWI-922W Mini PCI
-		    Amigo AWI-926W
-		    AMIT WL531P
-		    AOpen AOI-831
-		    ASUS WL-130G
-		    ASUS WL-130N
-		    ASUS WIFI-G-AAY
-		    Atlantis Land A02-PCI-W54
-		    Belkin F5D7000 v3
-		    Billionton MIWLGRL Mini PCI
-		    Canyon CN-WF511
-		    CNet CWP-854
-		    Compex WLP54G
-		    Conceptronic C54Ri
-		    Digitus DN-7006G-RA
-		    Dynalink WLG25PCI
-		    E-Tech WGPI02
-		    Edimax EW-7128g
-		    Edimax EW-7628Ig
-		    Edimax EW-7728In
-		    Eminent EM3037
-		    Encore ENLWI-G-RLAM
-		    Eusso UGL2454-VPR
-		    Fiberline WL-400P
-		    Gigabyte GN-WIKG Mini PCI
-		    Gigabyte GN-WI01GS Mini PCI
-		    Gigabyte GN-WI02GM Mini PCI
-		    Gigabyte GN-WPKG
-		    Gigabyte GN-WP01GS
-		    Gigabyte GN-WI02GM
-		    Gigabyte GN-WP01GM
-		    Hawking HWP54GR
-		    Hercules HWGPCI-54
-		    iNexQ CR054g-009 (R03)
-		    JAHT WN-4054PCI
-		    KCORP LifeStyle KLS-660
-		    LevelOne WNC-0301 v2
-		    Linksys WMP54G v4
-		    Longshine LCS-8031N
-		    Micronet SP906GK
-		    Minitar MN54GPC-R
-		    MSI MP54G2 Mini PCI
-		    MSI MP6833 Mini PCI
-		    MSI MS-6834
-		    MSI PC54G2
-		    OvisLink EVO-W54PCI
-		    PheeNet HWL-PCIG/RA
-		    Planex PCI-GW-DS300N
-		    Pro-Nets PC80211G
-		    Repotec RP-WP0854
-		    SATech SN-54P
-		    Signamax 065-1798
-		    Sitecom WL-115
-		    SparkLAN WL-660R
-		    SparkLAN WMIR-215GN Mini PCI
-		    Surecom EP-9321-g
-		    Surecom EP-9321-g1
-		    Sweex LC700030
-		    TekComm NE-9321-g
-		    Tonze PC-620C Mini PCI
-		    Tonze PC-6200C
-		    Unex CR054g-R02
-		    Zinwell ZWX-G360 Mini PCI
-		    Zinwell ZWX-G361
-		    Zonet ZEW1600
 		Ralink Technology IEEE 802.11b/g USB adapters
-		    AMIT WL532U
-		    ASUS WL-167g
-		    Belkin F5D7050
-		    Buffalo WLI-U2-KG54
-		    Buffalo WLI-U2-KG54-AI
-		    Buffalo WLI-U2-KG54-YB
-		    CNet CWD-854
-		    Compex WLU54G
-		    Conceptronic C54RU
-		    D-Link DWL-G122 (b1)
-		    Dynalink WLG25USB
-		    E-Tech WGUS02
-		    Eminent 3035
-		    Gigabyte GN-WBKG
-		    Hercules HWGUSB2-54
-		    KCORP LifeStyle KLS-685
-		    Linksys WUSB54G v4
-		    Linksys WUSB54GP v4
-		    MSI MS-6861
-		    MSI MS-6865
-		    MSI MS-6869
-		    Nintendo Wi-Fi USB Connector
-		    Nova Tech NV-902W
-		    OvisLink Evo-W54USB
-		    SerComm UB801R
-		    SparkLAN WL-685R
-		    Sphairon UB801R
-		    Surecom EP-9001-g rev 3A
-		    Sweex LC100060
-		    Tonze UW-6200C
-		    Zaapa ZNWUSB-54
-		    Zinwell ZPlus-G250
-		    Zinwell ZWX-G261
-		    Zonet ZEW2500
 		Ralink Technology USB IEEE 802.11a/b/g USB adapters
-		    3Com Aolynk WUB320g
-		    Abocom WUG2700
-		    Airlink101 AWLL5025
-		    ASUS WL-167g ver 2
-		    Atlantis Land A02-UP1-W54
-		    Belkin F5D7050 ver 3
-		    Belkin F5D9050 ver 3
-		    Belkin F5D9050C
-		    Buffalo WLI-U2-SG54HP
-		    Buffalo WLI-U2-G54HP
-		    CNet CWD-854 ver F
-		    Conceptronic C54RU ver 2
-		    Corega CG-WLUSB2GL
-		    Corega CG-WLUSB2GO
-		    Corega CG-WLUSB2GPX
-		    D-Link DWA-110
-		    D-Link DWA-111
-		    D-Link DWL-G122 rev C1
-		    D-Link WUA-1340
-		    Digitus DN-7003GR
-		    Edimax EW-7318Ug
-		    Edimax EW-7318USg
-		    Edimax EW-7618Ug
-		    Gigabyte GN-WB01GS
-		    Gigabyte GN-WI05GS
-		    Hawking HWUG1
-		    Hawking HWU54DM
-		    Hercules HWGUSB2-54-LB
-		    Hercules HWGUSB2-54V2-AP
-		    LevelOne WNC-0301USB v3
-		    Linksys WUSB200
-		    Linksys WUSB54G rev C
-		    Linksys WUSB54GR
-		    Planex GW-US54HP
-		    Planex GW-US54Mini2
-		    Planex GW-USMM
-		    Senao NUB-3701
-		    Sitecom WL-113 ver 2
-		    Sitecom WL-172
-		    Sweex LW053
-		    TP-LINK TL-WN321G
 		Ralink Technology USB IEEE 802.11a/b/g/Draft-N USB adapters
-	    	    ASUS USB-N11
-		    ASUS WL-160N
-		    Belkin F5D8051 ver 3000
-		    Belkin F5D8053
-		    Buffalo WLI-UC-AG300N
-		    Buffalo WLI-UC-GN
-		    Corega CG-WLUSB300GNM
-		    D-Link DWA-130
-		    D-Link DWA-140
-		    Edimax EW-7711UAn
-		    Edimax EW-7717Un
-		    Edimax EW-7718Un
-		    Gigabyte GN-WB32L
-		    Linksys WUSB600N
-		    Planex GW-USMicroN
-		    Planex GW-US300MiniS
 		Realtek RTL8180L IEEE 802.11b CardBus adapters
-		    Allnet ALL0182
-		    Belkin F5D6020 V3
-		    Buffalo WLI-CB-B11
-		    Corega CG-WLCB11V3
-		    D-Link DWL-610
-		    Edimax EW-7106
-		    GigaFast WF721-AEX (R* serial)
-		    Jensen AirLink 6011
-		    Level-One WPC-0101
-		    Linksys WPC11 v4
-		    Netgear MA521
-		    Ovislink AirLive WL-1120PCM
-		    Planet WL-3553
-		    Q-Tec 770WC
-		    Q-Tec 775WC
-		    Roper FreeLan 802.11b
-		    SAFECOM SWLCR-1100
-		    TRENDnet TEW-226PC
-		    VCTnet PC-11B1
-		    Winstron CB-200B
-		    Zonet ZEW1000
 		TI ACX100/ACX111 IEEE 802.11a/b/g CardBus adapters
-		    D-Link DWL-650+
-		    D-Link DWL-G630+
-		    D-Link DWL-G650+
-		    Ergenic ERG WL-003
-		    Hamlet HNWP254
-		    Linksys WPC54Gv2
-		    Microcom Travelcard
-		    Sceptre SC254W+
-		    USR USR5410
-		    ZyXEL G-160
 		TI ACX100/ACX111 IEEE 802.11a/b/g PCI adapters
-		    D-Link DWL-520+
-		    D-Link DWL-G520+
-		    Hawking HWP54G
-		    Netgear WG311v2
-		    Tornado/ADT 211g
-		    USR USR5416
-		    ZyXEL G-360 EE
 		WaveLAN/IEEE, PRISM 2-3, and Spectrum24 IEEE 802.11b Compact
-		Flash adapters (will be detected as PCMCIA adapters)
-		    AmbiCom WL1100C-CF
-		    ASUS SpaceLink WL-110
-		    Belkin F5D6060 (version 1 only)
-		    Buffalo AirStation
-		    D-Link DCF-660W
-		    ELSA XI800
-		    Linksys WCF12
-		    Netgear MA701
-		    Pretec Compact WLAN OC-WLBXX-A
-		    Senao NL-2511CF
+		    Flash adapters (will be detected as PCMCIA adapters)
 		WaveLAN/IEEE, PRISM 2-3, and Spectrum24 IEEE 802.11b PCI
-		adapters
-		    3Com AirConnect 3CRWE777A
-		    Addtron AWA-100
-		    Belkin F5D6001 (version 1 only)
-		    Corega CGWLPCIA11
-		    D-Link DWL-520 (rev A and B only)
-		    Intersil Mini PCI
-		    Intersil ISL3872
-		    Longshine 8301
-		    NDC/Sohoware NCP130
-		    Netgear MA311
-		    Nortel E-mobility 211818-A
-		    Samsung MagicLAN SWL-2210P
-		    Senao NL-2511MP
-		    Symbol LA4123
+		    adapters
 		WaveLAN/IEEE, PRISM 2-3, and Spectrum24 IEEE 802.11b PCMCIA
-		adapters
-		    3Com AirConnect 3CRWE737A
-		    Actiontec HWC01170
-		    Adaptec AWN-8030
-		    Addtron AWP-100
-		    Agere ORiNOCO
-		    Apple Airport
-		    ARtem Onair
-		    ASUS SpaceLink WL-100
-		    Belkin F5D6020 (version 1 only)
-		    Buffalo AirStation
-		    Cabletron RoamAbout
-		    Compaq Agency NC5004
-		    Contec FLEXLAN/FX-DS110-PCC
-		    Corega PCC-11
-		    Corega PCCA-11
-		    Corega PCCB-11
-		    D-Link DWL-650 (rev A1-J3 only)
-		    ELSA XI300
-		    ELSA XI325
-		    ELSA XI325H
-		    EMTAC A2424i
-		    Ericsson Wireless LAN CARD C11
-		    Gemtek WL-311
-		    Hawking Technology WE110P
-		    I-O DATA WN-B11/PCM
-		    Intel PRO/Wireless 2011
-		    Intersil Prism II
-		    Linksys Instant Wireless WPC11
-		    Linksys Instant Wireless WPC11 2.5
-		    Linksys Instant Wireless WPC11 3.0
-		    Lucent WaveLAN
-		    Microsoft MN520
-		    NANOSPEED ROOT-RZ2000
-		    NEC CMZ-RT-WP
-		    Netgear MA401
-		    Netgear MA401RA
-		    Nokia C020 Wireless LAN
-		    Nokia C110/C111 Wireless LAN
-		    NTT-ME 11Mbps Wireless LAN
-		    Planex GW-NS11H
-		    Proxim Harmony
-		    Proxim RangeLAN-DS
-		    Samsung MagicLAN SWL-2000N
-		    Siemens SpeedStream SS1021
-		    SMC 2632 EZ Connect
-		    Symbol Spectrum24
-		    TDK LAK-CD011WL
-		    US Robotics 2410
-		    US Robotics 2445
+		    adapters
 		WaveLAN/IEEE, PRISM 2-3, and Spectrum24 IEEE 802.11b USB
-		adapters
-		    Acer Warplink USB-400
-		    Actiontec HWU01170
-		    AirVast WM168b
-		    Ambit WLAN
-		    Apacer Wireless Steno MB112
-		    ASUS WL-140
-		    Compaq W100
-		    Corega WLUSB-11
-		    Corega WLUSB-11 Key
-		    D-Link DWL-120 (rev F)
-		    D-Link DWL-122
-		    I-O DATA WN-B11/USB
-		    Intel PRO/Wireless 2011B
-		    Intersil Prism 2X
-		    JVC MP-XP7250
-		    Linksys WUSB11 v3.0
-		    Linksys WUSB12
-		    Melco WLI-USB-KB11
-		    Melco WLI-USB-KS11G
-		    Melco WLI-USB-S11
-		    Microsoft MN510
-		    Netgear MA111 (version 1 only)
-		    Pheenet WL-503IA
-		    Planex GW-US11H
-		    Siemens SpeedStream SS1022
-		    Sitecom WL-022
-		    Syntax USB-400
-		    US Robotics 1120
-		    ViewSonic Airsync
-		    Z-Com XI-725/726
-		    Z-Com XI-735
-		    ZyXEL ZyAIR B-200
+		    adapters
 
 	Tape drives
 		SCSI Tape drives (st)
diff --git a/distrib/notes/sparc64/hardware b/distrib/notes/sparc64/hardware
index a6deff69289..95e56c4e048 100644
--- a/distrib/notes/sparc64/hardware
+++ b/distrib/notes/sparc64/hardware
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: hardware,v 1.150 2009/03/28 07:39:16 jmc Exp $
+dnl	$OpenBSD: hardware,v 1.151 2009/04/09 16:02:24 jsg Exp $
 OpenBSD/MACHINE OSREV runs on the following classes of machines:
 	Ultra 1/1E 
 	Ultra 2 
@@ -353,443 +353,27 @@ Supported devices {:-include-:}:
 
 	Wireless Ethernet Adapters
 		Atheros IEEE 802.11a/b/g CardBus adapters
-		    3Com 3CRPAG175
-		    Cisco AIR-CB21AG
-		    D-Link DWL-A650
-		    D-Link DWL-AB650
-		    Elecom LD-WL54
-		    Linksys WPC51AB
-		    Netgear WAB501
-		    Planet WL-3560
-		    Proxim Skyline 4030
-		    SMC SMC2735W
-		    Sony PCWA-C500
 		Atheros IEEE 802.11a/b/g PCI adapters
-		    D-Link DWL-A520
-		    IBM 11ABG WL LAN Mini PCI
-		    Proxim Skyline 4032
-		    Senao NL-5354MP Mini PCI
-		    Wistron CM9 Mini PCI
 		Atheros USB IEEE 802.11a/b/g USB adapters
-		    Compex WLU108AG
-		    Compex WLU108G
-		    D-Link DWL-G132
-		    IODATA WN-G54/US
-		    MELCO WLI-U2-KAMG54
-		    Netgear WG111T
-		    Netgear WG111U
-		    Netgear WPN111
-		    Olitec 000544
-		    Philips SNU6500
-		    PLANET WDL-U357
-		    Siemens Gigaset 108
-		    SMC SMCWUSBT-G
-		    SMC SMCWUSBT-G2
-		    SparkLAN WL-785A
-		    TP-Link TL-WN620G
-		    TRENDware International TEW-444UB
-		    TRENDware International TEW-504UB
-		    Unex Technology UR054ag
-		    ZyXEL XtremeMIMO M-202
 		Atmel AT76C50x IEEE 802.11b USB adapters
-		    3Com 3CRSHEW696
-		    AboCom BWU613
-		    Accton 2664W
-		    Acer Peripherals AWL300
-		    Acer Peripherals AWL400
-		    Actiontec 802UAT1
-		    Addtron AWU120
-		    Aincomm AWU2000B
-		    Askey Computer Voyager 1010
-		    Askey Computer WLL013 (Intersil Radio)
-		    Askey Computer WLL013 (RFMD Radio)
-		    Atmel AT76C503 (Intersil Radio)
-		    Atmel AT76C503 (RFMD Radio)
-		    Atmel AT76C505 (RFMD Radio)
-		    Atmel AT76C505 (RFMD 2958 Radio)
-		    Atmel AT76C505A (RFMD 2958 Radio)
-		    Atmel AT76C505AS (RFMD 2958 Radio)
-		    Belkin F5D6050
-		    Bluetake BW002
-		    Compaq iPAQ h54xx/h55xx Internal WLAN
-		    Conceptronic C11U
-		    Conceptronic WL210
-		    Corega WLAN USB Stick 11
-		    Dick Smith Electronics CHUSB 611G
-		    Dick Smith Electronics WL200U
-		    Dick Smith Electronics WL240U
-		    Dick Smith Electronics XH1153
-		    D-Link DWL-120 rev E
-		    Geowave GW-US11S
-		    Gigabyte GN-WLBM101
-		    Gigaset WLAN
-		    Hewlett-Packard HN210W
-		    Intel AP310 AnyPoint II
-		    I/O DATA USB WN-B11
-		    Lexar 2662W-AR
-		    Linksys WUSB11 802.11b
-		    Linksys WUSB11 802.11b v2.8
-		    MSI WLAN
-		    Netgear MA101
-		    Netgear MA101 rev B
-		    OQO model 01 WiFi
-		    Ovislink AirLive WL-1120USB
-		    OvisLink AirLive WL-1130USB
-		    Planex Communications GW-US11S
-		    Samsung SWL2100W
-		    Siemens WLL013
-		    SMC EZ Connect 11Mbps (SMC2662w)
-		    SMC EZ Connect 11Mbps v2 (SMC2662wV2)
-		    Tekram U-300C
-		    TRENDnet TEW-229UB
-		    W-Buddie WN210
-		    Z-Com M4Y-750
 		Conexant/Intersil Prism GT Full-MAC IEEE 802.11a/b/g PCI
-		adapters
-		    D-Link DWL-g650 A1
-		    I-O Data WN-G54/CB
-		    I4 Z-Com XG-600
-		    I4 Z-Com XG-900
-		    Intersil PRISM Indigo
-		    Intersil PRISM Duette
-		    PLANEX GW-DS54G
-		    SMC EZ Connect g 2.4GHz SMC2802W
-		    SMC 2802Wv2
+		    adapters
 		Marvell Libertas IEEE 802.11b/g Compact Flash adapters (will be
-		detected as PCMCIA adapters)
-		    Ambicom WL54CF
-		    I-O DATA WN-G54/CF
-		    SparkLAN WCFM-100
+		    detected as PCMCIA adapters)
 		Ralink Technology IEEE 802.11a/b/g CardBus adapters
-		    A-Link WL54PC
-		    Alfa AWPC036
-		    Amigo AWI-914W
-		    AMIT WL531C
-		    ASUS WL-107G
-		    Atlantis Land A02-PCM-W54
-		    Belkin F5D7010 v2
-		    Canyon CN-WF513
-		    CC&C WL-2102
-		    CNet CWC-854
-		    Compex WL54G
-		    Conceptronic C54RC
-		    Corega CG-WLCB54GL
-		    Digiconnect WL591C
-		    Digitus DN-7001G-RA
-		    E-Tech WGPC02
-		    E-Tech WGPC03
-		    Edimax EW-7108PCg
-		    Eminent EM3036
-		    Encore ENPWI-G-RLAM
-		    Eusso UGL2454-01R
-		    Fibreline WL-400X
-		    Gigabyte GN-WMKG
-		    Gigabyte GN-WM01GS
-		    Gigabyte GN-WM01GM
-		    Hawking HWC54GR
-		    Hercules HWGPCMCIA-54
-		    JAHT WN-4054P
-		    KCORP LifeStyle KLS-611
-		    LevelOne WPC-0301 v2
-		    Micronet SP908GK V3
-		    Minitar MN54GCB-R
-		    MSI CB54G2
-		    MSI MS-6835
-		    Pro-Nets CB80211G
-		    Repotec RP-WB7108
-		    SATech SN-54C
-		    Sitecom WL-112
-		    SparkLAN WL-611R
-		    SparkLAN WPCR-501
-		    Surecom EP-9428-g
-		    Sweex LC500050
-		    TekComm NE-9428-g
-		    Tonze PW-6200C
-		    Unex MR054g-R02
-		    Zinwell ZWX-G160
-		    Zonet ZEW1500
 		Ralink Technology IEEE 802.11a/b/g PCI adapters
-		    A-Link WL54H
-		    AirLive WN-5000PCI
-		    Amigo AWI-922W Mini PCI
-		    Amigo AWI-926W
-		    AMIT WL531P
-		    AOpen AOI-831
-		    ASUS WL-130G
-		    ASUS WL-130N
-		    ASUS WIFI-G-AAY
-		    Atlantis Land A02-PCI-W54
-		    Belkin F5D7000 v3
-		    Billionton MIWLGRL Mini PCI
-		    Canyon CN-WF511
-		    CNet CWP-854
-		    Compex WLP54G
-		    Conceptronic C54Ri
-		    Digitus DN-7006G-RA
-		    Dynalink WLG25PCI
-		    E-Tech WGPI02
-		    Edimax EW-7128g
-		    Edimax EW-7628Ig
-		    Edimax EW-7728In
-		    Eminent EM3037
-		    Encore ENLWI-G-RLAM
-		    Eusso UGL2454-VPR
-		    Fiberline WL-400P
-		    Gigabyte GN-WIKG Mini PCI
-		    Gigabyte GN-WI01GS Mini PCI
-		    Gigabyte GN-WI02GM Mini PCI
-		    Gigabyte GN-WPKG
-		    Gigabyte GN-WP01GS
-		    Gigabyte GN-WI02GM
-		    Gigabyte GN-WP01GM
-		    Hawking HWP54GR
-		    Hercules HWGPCI-54
-		    iNexQ CR054g-009 (R03)
-		    JAHT WN-4054PCI
-		    KCORP LifeStyle KLS-660
-		    LevelOne WNC-0301 v2
-		    Linksys WMP54G v4
-		    Longshine LCS-8031N
-		    Micronet SP906GK
-		    Minitar MN54GPC-R
-		    MSI MP54G2 Mini PCI
-		    MSI MP6833 Mini PCI
-		    MSI MS-6834
-		    MSI PC54G2
-		    OvisLink EVO-W54PCI
-		    PheeNet HWL-PCIG/RA
-		    Planex PCI-GW-DS300N
-		    Pro-Nets PC80211G
-		    Repotec RP-WP0854
-		    SATech SN-54P
-		    Signamax 065-1798
-		    Sitecom WL-115
-		    SparkLAN WL-660R
-		    SparkLAN WMIR-215GN Mini PCI
-		    Surecom EP-9321-g
-		    Surecom EP-9321-g1
-		    Sweex LC700030
-		    TekComm NE-9321-g
-		    Tonze PC-620C Mini PCI
-		    Tonze PC-6200C
-		    Unex CR054g-R02
-		    Zinwell ZWX-G360 Mini PCI
-		    Zinwell ZWX-G361
-		    Zonet ZEW1600
 		Ralink Technology IEEE 802.11b/g USB adapters
-		    AMIT WL532U
-		    ASUS WL-167g
-		    Belkin F5D7050
-		    Buffalo WLI-U2-KG54
-		    Buffalo WLI-U2-KG54-AI
-		    Buffalo WLI-U2-KG54-YB
-		    CNet CWD-854
-		    Compex WLU54G
-		    Conceptronic C54RU
-		    D-Link DWL-G122 (b1)
-		    Dynalink WLG25USB
-		    E-Tech WGUS02
-		    Eminent 3035
-		    Gigabyte GN-WBKG
-		    Hercules HWGUSB2-54
-		    KCORP LifeStyle KLS-685
-		    Linksys WUSB54G v4
-		    Linksys WUSB54GP v4
-		    MSI MS-6861
-		    MSI MS-6865
-		    MSI MS-6869
-		    Nintendo Wi-Fi USB Connector
-		    Nova Tech NV-902W
-		    OvisLink Evo-W54USB
-		    SerComm UB801R
-		    SparkLAN WL-685R
-		    Sphairon UB801R
-		    Surecom EP-9001-g rev 3A
-		    Sweex LC100060
-		    Tonze UW-6200C
-		    Zaapa ZNWUSB-54
-		    Zinwell ZPlus-G250
-		    Zinwell ZWX-G261
-		    Zonet ZEW2500
 		Ralink Technology USB IEEE 802.11a/b/g USB adapters
-		    3Com Aolynk WUB320g
-		    Abocom WUG2700
-		    Airlink101 AWLL5025
-		    ASUS WL-167g ver 2
-		    Atlantis Land A02-UP1-W54
-		    Belkin F5D7050 ver 3
-		    Belkin F5D9050 ver 3
-		    Belkin F5D9050C
-		    Buffalo WLI-U2-SG54HP
-		    Buffalo WLI-U2-G54HP
-		    CNet CWD-854 ver F
-		    Conceptronic C54RU ver 2
-		    Corega CG-WLUSB2GL
-		    Corega CG-WLUSB2GO
-		    Corega CG-WLUSB2GPX
-		    D-Link DWA-110
-		    D-Link DWA-111
-		    D-Link DWL-G122 rev C1
-		    D-Link WUA-1340
-		    Digitus DN-7003GR
-		    Edimax EW-7318Ug
-		    Edimax EW-7318USg
-		    Edimax EW-7618Ug
-		    Gigabyte GN-WB01GS
-		    Gigabyte GN-WI05GS
-		    Hawking HWUG1
-		    Hawking HWU54DM
-		    Hercules HWGUSB2-54-LB
-		    Hercules HWGUSB2-54V2-AP
-		    LevelOne WNC-0301USB v3
-		    Linksys WUSB200
-		    Linksys WUSB54G rev C
-		    Linksys WUSB54GR
-		    Planex GW-US54HP
-		    Planex GW-US54Mini2
-		    Planex GW-USMM
-		    Senao NUB-3701
-		    Sitecom WL-113 ver 2
-		    Sitecom WL-172
-		    Sweex LW053
-		    TP-LINK TL-WN321G
 		Ralink Technology USB IEEE 802.11a/b/g/Draft-N USB adapters
-	    	    ASUS USB-N11
-		    ASUS WL-160N
-		    Belkin F5D8051 ver 3000
-		    Belkin F5D8053
-		    Buffalo WLI-UC-AG300N
-		    Buffalo WLI-UC-GN
-		    Corega CG-WLUSB300GNM
-		    D-Link DWA-130
-		    D-Link DWA-140
-		    Edimax EW-7711UAn
-		    Edimax EW-7717Un
-		    Edimax EW-7718Un
-		    Gigabyte GN-WB32L
-		    Linksys WUSB600N
-		    Planex GW-USMicroN
-		    Planex GW-US300MiniS
 		TI ACX100/ACX111 IEEE 802.11a/b/g PCI adapters
-		    D-Link DWL-520+
-		    D-Link DWL-G520+
-		    Hawking HWP54G
-		    Netgear WG311v2
-		    Tornado/ADT 211g
-		    USR USR5416
-		    ZyXEL G-360 EE
 		WaveLAN/IEEE, PRISM 2-3, and Spectrum24 IEEE 802.11b Compact
-		Flash adapters (will be detected as PCMCIA adapters)
-		    AmbiCom WL1100C-CF
-		    ASUS SpaceLink WL-110
-		    Belkin F5D6060 (version 1 only)
-		    Buffalo AirStation
-		    D-Link DCF-660W
-		    ELSA XI800
-		    Linksys WCF12
-		    Netgear MA701
-		    Pretec Compact WLAN OC-WLBXX-A
-		    Senao NL-2511CF
+		    Flash adapters (will be detected as PCMCIA adapters)
 		WaveLAN/IEEE, PRISM 2-3, and Spectrum24 IEEE 802.11b PCI
-		adapters
-		    3Com AirConnect 3CRWE777A
-		    Addtron AWA-100
-		    Belkin F5D6001 (version 1 only)
-		    Corega CGWLPCIA11
-		    D-Link DWL-520 (rev A and B only)
-		    Intersil Mini PCI
-		    Intersil ISL3872
-		    Longshine 8301
-		    NDC/Sohoware NCP130
-		    Netgear MA311
-		    Nortel E-mobility 211818-A
-		    Samsung MagicLAN SWL-2210P
-		    Senao NL-2511MP
-		    Symbol LA4123
+		    adapters
 		WaveLAN/IEEE, PRISM 2-3, and Spectrum24 IEEE 802.11b PCMCIA
-		adapters
-		    3Com AirConnect 3CRWE737A
-		    Actiontec HWC01170
-		    Adaptec AWN-8030
-		    Addtron AWP-100
-		    Agere ORiNOCO
-		    ARtem Onair
-		    ASUS SpaceLink WL-100
-		    Belkin F5D6020 (version 1 only)
-		    Buffalo AirStation
-		    Cabletron RoamAbout
-		    Compaq Agency NC5004
-		    Contec FLEXLAN/FX-DS110-PCC
-		    Corega PCC-11
-		    Corega PCCA-11
-		    Corega PCCB-11
-		    D-Link DWL-650 (rev A1-J3 only)
-		    ELSA XI300
-		    ELSA XI325
-		    ELSA XI325H
-		    EMTAC A2424i
-		    Ericsson Wireless LAN CARD C11
-		    Gemtek WL-311
-		    Hawking Technology WE110P
-		    I-O DATA WN-B11/PCM
-		    Intel PRO/Wireless 2011
-		    Intersil Prism II
-		    Linksys Instant Wireless WPC11
-		    Linksys Instant Wireless WPC11 2.5
-		    Linksys Instant Wireless WPC11 3.0
-		    Lucent WaveLAN
-		    Microsoft MN520
-		    NANOSPEED ROOT-RZ2000
-		    NEC CMZ-RT-WP
-		    Netgear MA401
-		    Netgear MA401RA
-		    Nokia C020 Wireless LAN
-		    Nokia C110/C111 Wireless LAN
-		    NTT-ME 11Mbps Wireless LAN
-		    Planex GW-NS11H
-		    Proxim Harmony
-		    Proxim RangeLAN-DS
-		    Samsung MagicLAN SWL-2000N
-		    Siemens SpeedStream SS1021
-		    SMC 2632 EZ Connect
-		    Symbol Spectrum24
-		    TDK LAK-CD011WL
-		    US Robotics 2410
-		    US Robotics 2445
+		    adapters
 		WaveLAN/IEEE, PRISM 2-3, and Spectrum24 IEEE 802.11b USB
-		adapters
-		    Acer Warplink USB-400
-		    Actiontec HWU01170
-		    AirVast WM168b
-		    Ambit WLAN
-		    Apacer Wireless Steno MB112
-		    ASUS WL-140
-		    Compaq W100
-		    Corega WLUSB-11
-		    Corega WLUSB-11 Key
-		    D-Link DWL-120 (rev F)
-		    D-Link DWL-122
-		    I-O DATA WN-B11/USB
-		    Intel PRO/Wireless 2011B
-		    Intersil Prism 2X
-		    JVC MP-XP7250
-		    Linksys WUSB11 v3.0
-		    Linksys WUSB12
-		    Melco WLI-USB-KB11
-		    Melco WLI-USB-KS11G
-		    Melco WLI-USB-S11
-		    Microsoft MN510
-		    Netgear MA111 (version 1 only)
-		    Pheenet WL-503IA
-		    Planex GW-US11H
-		    Siemens SpeedStream SS1022
-		    Sitecom WL-022
-		    Syntax USB-400
-		    US Robotics 1120
-		    ViewSonic Airsync
-		    Z-Com XI-725/726
-		    Z-Com XI-735
-		    ZyXEL ZyAIR B-200
+		    adapters
 
 	WAN Adapters
 		SBE (formerly Lan Media Corporation) SSI (T1)/HSSI/DS1/DS3
diff --git a/distrib/notes/zaurus/hardware b/distrib/notes/zaurus/hardware
index 1c0b16f8378..5443b0d66b7 100644
--- a/distrib/notes/zaurus/hardware
+++ b/distrib/notes/zaurus/hardware
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: hardware,v 1.32 2009/03/28 07:39:16 jmc Exp $
+dnl	$OpenBSD: hardware,v 1.33 2009/04/09 16:02:24 jsg Exp $
 dnl When more than one model is supported, turn this into a list...
 The following Sharp Zaurus models are supported by OpenBSD:
 
@@ -114,188 +114,16 @@ and serial ports), many USB devices are supported. These {:-include-:}:
 		    Z-TEK ZK-R02
 	Wireless Ethernet Adapters
 		Atmel AT76C50x IEEE 802.11b USB adapters
-		    3Com 3CRSHEW696
-		    AboCom BWU613
-		    Accton 2664W
-		    Acer Peripherals AWL300
-		    Acer Peripherals AWL400
-		    Actiontec 802UAT1
-		    Addtron AWU120
-		    Aincomm AWU2000B
-		    Askey Computer Voyager 1010
-		    Askey Computer WLL013 (Intersil Radio)
-		    Askey Computer WLL013 (RFMD Radio)
-		    Atmel AT76C503 (Intersil Radio)
-		    Atmel AT76C503 (RFMD Radio)
-		    Atmel AT76C505 (RFMD Radio)
-		    Atmel AT76C505 (RFMD 2958 Radio)
-		    Atmel AT76C505A (RFMD 2958 Radio)
-		    Atmel AT76C505AS (RFMD 2958 Radio)
-		    Belkin F5D6050
-		    Bluetake BW002
-		    Compaq iPAQ h54xx/h55xx Internal WLAN
-		    Conceptronic C11U
-		    Conceptronic WL210
-		    Corega WLAN USB Stick 11
-		    Dick Smith Electronics CHUSB 611G
-		    Dick Smith Electronics WL200U
-		    Dick Smith Electronics WL240U
-		    Dick Smith Electronics XH1153
-		    D-Link DWL-120 rev E
-		    Geowave GW-US11S
-		    Gigabyte GN-WLBM101
-		    Gigaset WLAN
-		    Hewlett-Packard HN210W
-		    Intel AP310 AnyPoint II
-		    I/O DATA USB WN-B11
-		    Lexar 2662W-AR
-		    Linksys WUSB11 802.11b
-		    Linksys WUSB11 802.11b v2.8
-		    MSI WLAN
-		    Netgear MA101
-		    Netgear MA101 rev B
-		    OQO model 01 WiFi
-		    Ovislink AirLive WL-1120USB
-		    OvisLink AirLive WL-1130USB
-		    Planex Communications GW-US11S
-		    Samsung SWL2100W
-		    Siemens WLL013
-		    SMC EZ Connect 11Mbps (SMC2662w)
-		    SMC EZ Connect 11Mbps v2 (SMC2662wV2)
-		    Tekram U-300C
-		    TRENDnet TEW-229UB
-		    W-Buddie WN210
-		    Z-Com M4Y-750
 		Marvell Libertas IEEE 802.11b/g Compact Flash adapters (will be
-		detected as PCMCIA adapters)
+		 detected as PCMCIA adapters)
 		    Ambicom WL54CF
 		Ralink Technology IEEE 802.11b/g USB adapters
-		    AMIT WL532U
-		    ASUS WL-167g
-		    Belkin F5D7050
-		    Buffalo WLI-U2-KG54
-		    Buffalo WLI-U2-KG54-AI
-		    Buffalo WLI-U2-KG54-YB
-		    CNet CWD-854
-		    Compex WLU54G
-		    Conceptronic C54RU
-		    D-Link DWL-G122 (b1)
-		    Dynalink WLG25USB
-		    E-Tech WGUS02
-		    Eminent 3035
-		    Gigabyte GN-WBKG
-		    Hercules HWGUSB2-54
-		    KCORP LifeStyle KLS-685
-		    Linksys WUSB54G v4
-		    Linksys WUSB54GP v4
-		    MSI MS-6861
-		    MSI MS-6865
-		    MSI MS-6869
-		    Nintendo Wi-Fi USB Connector
-		    Nova Tech NV-902W
-		    OvisLink Evo-W54USB
-		    SerComm UB801R
-		    SparkLAN WL-685R
-		    Sphairon UB801R
-		    Surecom EP-9001-g rev 3A
-		    Sweex LC100060
-		    Tonze UW-6200C
-		    Zaapa ZNWUSB-54
-		    Zinwell ZPlus-G250
-		    Zinwell ZWX-G261
-		    Zonet ZEW2500
 		Ralink Technology USB IEEE 802.11a/b/g USB adapters
-		    3Com Aolynk WUB320g
-		    Abocom WUG2700
-		    Airlink101 AWLL5025
-		    ASUS WL-167g ver 2
-		    Atlantis Land A02-UP1-W54
-		    Belkin F5D7050 ver 3
-		    Belkin F5D9050 ver 3
-		    Buffalo WLI-U2-SG54HP
-		    Buffalo WLI-U2-G54HP
-		    CNet CWD-854 ver F
-		    Conceptronic C54RU ver 2
-		    Corega CG-WLUSB2GL
-		    Corega CG-WLUSB2GO
-		    Corega CG-WLUSB2GPX
-		    D-Link DWL-G122 rev C1
-		    D-Link WUA-1340
-		    Digitus DN-7003GR
-		    Edimax EW-7318Ug
-		    Edimax EW-7318USg
-		    Edimax EW-7618Ug
-		    Gigabyte GN-WB01GS
-		    Gigabyte GN-WI05GS
-		    Hawking HWUG1
-		    Hawking HWU54DM
-		    Hercules HWGUSB2-54-LB
-		    Hercules HWGUSB2-54V2-AP
-		    LevelOne WNC-0301USB v3
-		    Linksys WUSB200
-		    Linksys WUSB54G rev C
-		    Linksys WUSB54GR
-		    Planex GW-US54HP
-		    Planex GW-US54Mini2
-		    Planex GW-USMM
-		    Senao NUB-3701
-		    Sitecom WL-113 ver 2
-		    Sitecom WL-172
-		    Sweex LW053
-		    TP-LINK TL-WN321G
 		Ralink Technology USB IEEE 802.11a/b/g/Draft-N USB adapters
-		    ASUS USB-N11
-		    ASUS WL-160N
-		    Belkin F5D8051 ver 3000
-		    Belkin F5D8053
-		    Buffalo WLI-UC-AG300N
-		    Buffalo WLI-UC-GN
-		    Corega CG-WLUSB300GNM
-		    D-Link DWA-130
-		    D-Link DWA-140
-		    Edimax EW-7711UAn
-		    Edimax EW-7717Un
-		    Edimax EW-7718Un
-		    Gigabyte GN-WB32L
-		    Linksys WUSB600N
-		    Planex GW-USMicroN
-		    Planex GW-US300MiniS
 		WaveLAN/IEEE, PRISM 2-3, and Spectrum24 IEEE 802.11b USB
-		adapters
-		    Acer Warplink USB-400
-		    Actiontec HWU01170
-		    AirVast WM168b
-		    Ambit WLAN
-		    Apacer Wireless Steno MB112
-		    ASUS WL-140
-		    Compaq W100
-		    Corega WLUSB-11
-		    Corega WLUSB-11 Key
-		    D-Link DWL-120 (rev F)
-		    D-Link DWL-122
-		    I-O DATA WN-B11/USB
-		    Intel PRO/Wireless 2011B
-		    Intersil Prism 2X
-		    JVC MP-XP7250
-		    Linksys WUSB11 v3.0
-		    Linksys WUSB12
-		    Melco WLI-USB-KB11
-		    Melco WLI-USB-KS11G
-		    Melco WLI-USB-S11
-		    Microsoft MN510
-		    Netgear MA111 (version 1 only)
-		    Pheenet WL-503IA
-		    Planex GW-US11H
-		    Siemens SpeedStream SS1022
-		    Sitecom WL-022
-		    Syntax USB-400
-		    US Robotics 1120
-		    ViewSonic Airsync
-		    Z-Com XI-725/726
-		    Z-Com XI-735
-		    ZyXEL ZyAIR B-200
+		 adapters
 		WaveLAN/IEEE, PRISM 2-3, and Spectrum24 IEEE 802.11b Compact
-		Flash adapters (will be detected as PCMCIA adapters)
+		 Flash adapters (will be detected as PCMCIA adapters)
 		    AmbiCom WL1100C-CF
 		    ASUS SpaceLink WL-110
 		    Belkin F5D6060 (version 1 only)
@@ -307,55 +135,7 @@ and serial ports), many USB devices are supported. These {:-include-:}:
 		    Pretec Compact WLAN OC-WLBXX-A
 		    Senao NL-2511CF
 		WaveLAN/IEEE, PRISM 2-3, and Spectrum24 IEEE 802.11b PCMCIA
-		adapters
-		    3Com AirConnect 3CRWE737A
-		    Actiontec HWC01170
-		    Adaptec AWN-8030
-		    Addtron AWP-100
-		    Agere ORiNOCO
-		    ARtem Onair
-		    ASUS SpaceLink WL-100
-		    Belkin F5D6020 (version 1 only)
-		    Buffalo AirStation
-		    Cabletron RoamAbout
-		    Compaq Agency NC5004
-		    Contec FLEXLAN/FX-DS110-PCC
-		    Corega PCC-11
-		    Corega PCCA-11
-		    Corega PCCB-11
-		    D-Link DWL-650 (rev A1-J3 only)
-		    ELSA XI300
-		    ELSA XI325
-		    ELSA XI325H
-		    EMTAC A2424i
-		    Ericsson Wireless LAN CARD C11
-		    Gemtek WL-311
-		    Hawking Technology WE110P
-		    I-O DATA WN-B11/PCM
-		    Intel PRO/Wireless 2011
-		    Intersil Prism II
-		    Linksys Instant Wireless WPC11
-		    Linksys Instant Wireless WPC11 2.5
-		    Linksys Instant Wireless WPC11 3.0
-		    Lucent WaveLAN
-		    Microsoft MN520
-		    NANOSPEED ROOT-RZ2000
-		    NEC CMZ-RT-WP
-		    Netgear MA401
-		    Netgear MA401RA
-		    Nokia C020 Wireless LAN
-		    Nokia C110/C111 Wireless LAN
-		    NTT-ME 11Mbps Wireless LAN
-		    Planex GW-NS11H
-		    Proxim Harmony
-		    Proxim RangeLAN-DS
-		    Samsung MagicLAN SWL-2000N
-		    Siemens SpeedStream SS1021
-		    SMC 2632 EZ Connect
-		    Symbol Spectrum24
-		    TDK LAK-CD011WL
-		    US Robotics 2410
-		    US Robotics 2445
+		 adapters
 	Serial ports
 		Most modems, digital cellular modems, and serial
 		cards should work