re-sync after the big svn loss

1 files changed, 64 insertions, 52 deletions

diff --git a/lst/usbtable b/lst/usbtable
index 5ed53ee9..317bd4a0 100644
--- a/lst/usbtable
+++ b/lst/usbtable
@@ -993,17 +993,18 @@
 0x03e8	0x0008	"kaweth"	"AOX Inc.|101 Ethernet [klsi]"
 0x03eb	0x3301	"unknown"	"Atmel Corp.|4-port Hub"
 0x03eb	0x3312	"unknown"	"Atmel Corp.|4-port Hub"
-0x03eb	0x4102	"at76c503-rfmd"	""
+0x03eb	0x4102	"at76_usb"	""
 0x03eb	0x5601	"unknown"	"Atmel Corp.|at76c510 Intersil 802.11b Access Point"
 0x03eb	0x5603	"unknown"	"Atmel Corp.|Cisco 7920 WiFi IP Phone"
-0x03eb	0x7603	"at76c503-i3861"	"Atmel Corp.|AT76c503a D-Link DWL-120"
-0x03eb	0x7604	"at76c503-i3863"	""
-0x03eb	0x7605	"at76c503-rfmd"	"Atmel Corp.|AT76c503a 802.11b Adapter"
-0x03eb	0x7606	"at76c505-rfmd"	"Atmel Corp.|AT76c505 802.11b dapter"
+0x03eb	0x7603	"at76_usb"	"Atmel Corp.|AT76c503a D-Link DWL-120"
+0x03eb	0x7604	"at76_usb"	""
+0x03eb	0x7605	"at76_usb"	"Atmel Corp.|AT76c503a 802.11b Adapter"
+0x03eb	0x7606	"at76_usb"	"Atmel Corp.|AT76c505 802.11b dapter"
 0x03eb	0x7611	"unknown"	"Atmel Corp.|at76c510 rfmd2948 802.11b Access Point"
-0x03eb	0x7613	"at76c505-rfmd2958"	""
-0x03eb	0x7614	"at76c505a-rfmd2958"	""
-0x03eb	0x7617	"at76c505a-rfmd2958"	""
+0x03eb	0x7613	"at76_usb"	""
+0x03eb	0x7614	"at76_usb"	""
+0x03eb	0x7615	"at76_usb"	""
+0x03eb	0x7617	"at76_usb"	""
 0x03ee	0x0000	"usb-storage"	"Mitsumi|CD-R/RW Drive"
 0x03ee	0x641f	"unknown"	"Mitsumi|WIF-0402C Bluetooth Adapter"
 0x03ee	0x6440	"unknown"	"Mitsumi|WML-C52APR Bluetooth Adapter"
@@ -1016,7 +1017,7 @@
 0x03f0	0x0107	"usb-storage"	"Hewlett-Packard|CD-Writer Plus"
 0x03f0	0x010c	"unknown"	"Hewlett-Packard|Multimedia Keyboard Hub"
 0x03f0	0x0111	"unknown"	"Hewlett-Packard|G55xi Printer/Scanner/Copier"
-0x03f0	0x011c	"at76c503-i3861"	"Hewlett-Packard|hn210w 802.11b Wireless Ethernet"
+0x03f0	0x011c	"at76_usb"	"Hewlett-Packard|hn210w 802.11b Wireless Ethernet"
 0x03f0	0x0121	"unknown"	"Hewlett-Packard|HP49g+ Calculator"
 0x03f0	0x0201	"scanner"	"Hewlett-Packard|ScanJet 6200C"
 0x03f0	0x0202	"unknown"	"Hewlett-Packard|PhotoSmart S20"
@@ -1467,8 +1468,10 @@
 0x046d	0xc00e	"unknown"	"Logitech Inc.|Optical Mouse"
 0x046d	0xc012	"unknown"	"Logitech Inc.|Optical Mouse"
 0x046d	0xc016	"unknown"	"Logitech, Inc.|Optical Mouse"
-0x046d	0xc01b	"unknown"	"Logitech, Inc.|MX310 Optical Mouse"
-0x046d	0xc025	"unknown"	"Logitech, Inc.|MX500 Optical Mouse"
+0x046d	0xc01b	"Mouse:imwheel:generic"	"Logitech, Inc.|MX310 Optical Mouse"
+0x046d	0xc01d	"Mouse:evdev|imwheel:MX500"	"Logitech, Inc.|MX510 Optical Mouse"
+0x046d	0xc01e	"Mouse:evdev|imwheel:MX500"	"Logitech, Inc.|MX518 Optical Mouse"
+0x046d	0xc025	"Mouse:evdev|imwheel:MX500"	"Logitech, Inc.|MX500 Optical Mouse"
 0x046d	0xc030	"Mouse:USB|Generic"	"Logitech Inc.|iFeel Mouse"
 0x046d	0xc032	"Mouse:USB|Wheel"	"Logitech Inc.|MouseMan iFeel"
 0x046d	0xc202	"unknown"	"Logitech Inc.|WingMan Formula"
@@ -1495,8 +1498,8 @@
 0x046d	0xc503	"unknown"	"Logitech Inc.|Cordless Mouse+Keyboard Receiver"
 0x046d	0xc504	"Mouse:USB|Wheel"	"Logitech Inc.|Cordless Mouse+Keyboard Receiver"
 0x046d	0xc505	"unknown"	"Logitech, Inc.|Cordless Mouse+Keyboard Receiver"
-0x046d	0xc506	"unknown"	"Logitech, Inc.|MX-700 Cordless Mouse Receiver"
-0x046d	0xc50e	"unknown"	"Logitech, Inc.|MX-1000 Cordless Mouse Receiver"
+0x046d	0xc506	"Mouse:evdev|imwheel:MX700"	"Logitech, Inc.|MX-700 Cordless Mouse Receiver"
+0x046d	0xc50e	"Mouse:evdev|imwheel:MX1000"	"Logitech, Inc.|MX-1000 Cordless Mouse Receiver"
 0x046d	0xd001	"unknown"	"Logitech Inc.|QuickCam Pro"
 0x046e	0x6782	"unknown"	"Behavior Tech. Computer|BTC 7932 keyboard"
 0x0471	0x0101	"unknown"	"Philips|DSS350 Digital Speaker System"
@@ -1637,7 +1640,7 @@
 0x049f	0x0018	"unknown"	"Compaq Computer Corp.|PA-1/PA-2 MP3 Player"
 0x049f	0x001a	"unknown"	"Compaq Computer Corp.|S4 100 Scanner"
 0x049f	0x0021	"unknown"	"Compaq Computer Corp.|S200 Scanner"
-0x049f	0x0032	"at76c503-rfmd"	""
+0x049f	0x0032	"at76_usb"	""
 0x049f	0x0033	"prism2_usb"	"Compaq Computer Corp.|801.11b Adapter"
 0x049f	0x0076	"prism2_usb"	"Compaq Computer Corp.|801.11b Adapter"
 0x049f	0x505a	"usbnet"	"Compaq Computer Corp.|Netowrk Interface"
@@ -1658,8 +1661,8 @@
 0x04a5	0x20fc	"unknown"	"Acer Peripherals Inc. (now BenQ Corp.)|Benq 5000"
 0x04a5	0x20fe	"scanner"	"Acer Peripherals Inc.|SW2 5300U"
 0x04a5	0x3003	"unknown"	"Acer Peripherals Inc.|Benq WebCam"
-0x04a5	0x9000	"at76c503-i3861"	""
-0x04a5	0x9001	"at76c503-rfmd"	""
+0x04a5	0x9000	"at76_usb"	""
+0x04a5	0x9001	"at76_usb"	""
 0x04a5	0x9213	"unknown"	"Acer Peripherals Inc.|Kbd Hub"
 0x04a7	0x0211	"scanner"	"Visioneer|OneTouch 7600 USB"
 0x04a7	0x0221	"scanner"	"Visioneer|OneTouch 5300 Scanner"
@@ -1844,7 +1847,7 @@
 0x04bb	0x0901	"kaweth"	"Rainbow Technologies, Inc.|"
 0x04bb	0x0904	"pegasus"	"I-O Data Device, Inc.|ET/TX Ethernet [pegasus]"
 0x04bb	0x0913	"pegasus"	"I-O Data Device, Inc.|ET/TX Ethernet"
-0x04bb	0x0919	"at76c503-i3861"	""
+0x04bb	0x0919	"at76_usb"	""
 0x04bb	0x0922	"prism2_usb"	"I-O Data Device, Inc.|IOData AirPort WN-B11/USBS 802.11b"
 0x04bb	0x0a03	"pl2303"	""
 0x04bf	0x0100	"unknown"	"TDK Corp.|MediaReader CF"
@@ -1953,14 +1956,14 @@
 0x0502	0xd001	"unknown"	"Acer, Inc.|Divio NW801 Digital Camera"
 0x0506	0x00a0	"unknown"	"3Com Corp.|3CREB96 Bluetooth Adapter"
 0x0506	0x03e8	"kaweth"	"3Com Corp.|3C19250 Ethernet [klsi]"
-0x0506	0x0a01	"at76c503-rfmd"	""
+0x0506	0x0a01	"at76_usb"	""
 0x0506	0x11f8	"kaweth"	""
 0x0506	0x4601	"pegasus"	"3Com Corp.|USB Network Adapter"
 0x0506	0xf002	"unknown"	"3Com Corp.|3CP4218 ADSL Modem (pre-init)"
 0x0506	0xf003	"unknown"	"3Com Corp.|3CP4218 ADSL Modem"
 0x0506	0xf100	"unknown"	"3Com Corp.|3CP4218 ADSL Modem (pre-init)"
 0x050d	0x0004	"usbnet"	"Belkin Components|"
-0x050d	0x0050	"at76c503-rfmd"	""
+0x050d	0x0050	"at76_usb"	""
 0x050d	0x0084	"hci_usb"	"Belkin Components|Bluetooth USB Adapter"
 0x050d	0x0103	"belkin_sa"	"Belkin Components|F5U103 Serial Adapter"
 0x050d	0x0109	"mct_u232"	"Belkin Components|PDA Adapter"
@@ -2069,7 +2072,7 @@
 0x0557	0x4000	"kaweth"	"ATEN International Co. Ltd.|DSB-650 10Mbps Ethernet [klsi]"
 0x055d	0x9000	"pwc"	"Samsung Electro-Mechanics Co.|AnyCam"
 0x055d	0x9001	"pwc"	"Samsung Electro-Mechanics Co.|MPC-C31 AnyCam Premium for Notebooks"
-0x055d	0xa000	"at76c503-i3863"	""
+0x055d	0xa000	"at76_usb"	""
 0x055f	0x0001	"scanner"	"Mustek Systems Inc.|ScanExpress 1200 CU"
 0x055f	0x0002	"scanner"	"Mustek Systems Inc.|ScanExpress 600 CU"
 0x055f	0x0003	"scanner"	"Mustek Systems Inc.|ScanExpress 1200 USB"
@@ -2329,7 +2332,7 @@
 0x05dc	0x0001	"usb-storage"	"Lexar|Jumpshot USB CF Reader"
 0x05dc	0x0080	"unknown"	"Lexar Media, Inc.|Jumpdrive Secure 64MB"
 0x05dc	0xb018	"unknown"	"Lexar Media, Inc.|Multi-Card Reader"
-0x05dd	0xff31	"at76c503-i3861"	""
+0x05dd	0xff31	"at76_usb"	""
 0x05e3	0x000a	"unknown"	"Genesys Logic, Inc.|Keyboard with PS/2 Port"
 0x05e3	0x000b	"Mouse:USB|Wheel"	"Genesys Logic, Inc.|Karna Razor BoomSlang 2000 Mouse"
 0x05e3	0x0100	"unknown"	"Genesys Logic, Inc.|Nintendo Game Boy Advance SP"
@@ -2407,7 +2410,7 @@
 0x066b	0x2203	"pegasus"	"Linksys Inc.|USB100TX Ethernet [pegasus]"
 0x066b	0x2204	"pegasus"	"Linksys Inc.|USB100TX Ethernet [pegasus]"
 0x066b	0x2206	"pegasus"	"Linksys Inc.|USB Ethernet [pegasus]"
-0x066b	0x2211	"at76c503-i3861"	"Linksys Inc.|WUSB11 Wireless Ethernet"
+0x066b	0x2211	"at76_usb"	"Linksys Inc.|WUSB11 Wireless Ethernet"
 0x066b	0x2212	"prism2_usb"	"Linksys Inc.|WUSB11v2.5 802.11b Adapter"
 0x066b	0x2213	"prism2_usb"	"Linksys Inc.|USB 802.11 adapter"
 0x066b	0x400b	"pegasus"	"Linksys Inc.|USB Network Adapter"
@@ -2442,7 +2445,7 @@
 0x0681	0x0002	"unknown"	"Siemens Information and Communication Products|Gigaset 3075 Passive ISDN"
 0x0681	0x0005	"scanner"	"Siemens Information and Communication Products|Mouse with Fingerprint Reader"
 0x0681	0x0012	"unknown"	"Siemens Information and Communication Products|I-Gate 11MB Wireless Lan"
-0x0681	0x001b	"at76c503-rfmd"	""
+0x0681	0x001b	"at76_usb"	""
 0x0681	0x002b	"unknown"	"Siemens Information and Communication Products|A-100-I ADSL Modem"
 0x0686	0x4003	"unknown"	"Minolta Co., Ltd|Dimage 2330 Zoom"
 0x0686	0x4004	"hpusbscsi"	"Minolta Co., Ltd.|Scan Elite II"
@@ -2479,9 +2482,9 @@
 0x0698	0x9999	"unknown"	"Chuntex (CTX)|VL710S Monitor+Hub"
 0x069a	0x0001	"pwc"	"Askey Computer Corp.|WebCam"
 0x069a	0x0303	"unknown"	"Askey Computer Corp.|Cable Modem"
-0x069a	0x0320	"at76c503-i3861"	""
-0x069a	0x0321	"at76c503-rfmd"	"Askey Computer Corp.|Dynalink WLL013 / Compex WLU11A 802.11b Adapter"
-0x069a	0x0821	"unknown"	"Askey Computer Corp.|BT Voyager 1010 802.11b Adapter"
+0x069a	0x0320	"at76_usb"	""
+0x069a	0x0321	"at76_usb"	"Askey Computer Corp.|Dynalink WLL013 / Compex WLU11A 802.11b Adapter"
+0x069a	0x0821	"at76_usb"	"Askey Computer Corp.|BT Voyager 1010 802.11b Adapter"
 0x069b	0x0704	"unknown"	"Thomson, Inc.|DCM245 Cable Modem"
 0x069b	0x2220	"unknown"	"Thomson, Inc.|RCA Kazoo RD1000 MP3 Player"
 0x069b	0x300a	"unknown"	"Thomson, Inc.|RCA Lyra MP3 Player"
@@ -2634,9 +2637,9 @@
 0x076b	0x0596	"unknown"	"OmniKey Cardman 2020"
 0x076b	0x1784	"unknown"	"OmniKey Cardman 6020"
 0x076b	0x3021	"unknown"	"OmniKey AG|CardMan 3121"
-0x077b	0x2219	"at76c503-rfmd"	"Linksys|WUSB11 V2.6 802.11b Adapter"
+0x077b	0x2219	"at76_usb"	"Linksys|WUSB11 V2.6 802.11b Adapter"
 0x077b	0x2226	"usbnet"	"Linksys|USB200M 100baseTX Adapter"
-0x077b	0x2227	"at76c503-rfmd"	""
+0x077b	0x2227	"at76_usb"	""
 0x077c	0x0005	"unknown"	"Forward Electronics Co., Ltd.|NEC Keyboard"
 0x077d	0x0223	"unknown"	"Griffin Technology|IMic Audio In/Out"
 0x077d	0x0410	"powermate"	"Griffin Technology|PowerMate"
@@ -2684,7 +2687,7 @@
 0x07aa	0x0004	"pegasus"	"Correga K.K.|FEther USB-TX Ethernet [pegasus]"
 0x07aa	0x000d	"pegasus"	""
 0x07aa	0x0012	"prism2_usb"	"Corega K.K.|Stick-11 802.11b Adapter"
-0x07aa	0x7613	"at76c505-rfmd2958"	""
+0x07aa	0x7613	"at76_usb"	""
 0x07ab	0xfc01	"usb-storage"	"Freecom/Memorex|USB-IDE/BBQ Series 100 CD-R/RW"
 0x07ab	0xfc03	"unknown"	"Freecom Technologies|USB2-IDE IDE bridge"
 0x07af	0x0004	"usb-storage"	"Microtech|SCSI-DB25 SCSI Bridge [shuttle]"
@@ -2729,8 +2732,9 @@
 0x07b8	0x4102	"pegasus"	"D-Link, Inc.|USB Network Adapter"
 0x07b8	0x4104	"pegasus"	"D-Link, Inc.|USB Network Adapter"
 0x07b8	0x420a	"usbnet"	""
+0x07b8	0x6001	"zd1211rw"	""
 0x07b8	0xabc1	"pegasus"	"D-Link, Inc.|DU-E10 Ethernet [pegasus]"
-0x07b8	0xb000	"at76c503-rfmd"	""
+0x07b8	0xb000	"at76_usb"	""
 0x07b8	0xf101	"unknown"	"D-Link, Inc.|DSB-560 Modem [atlas]"
 0x07c0	0x1121	"unknown"	"Code Mercenaries Hard- und Software GmbH|The Claw"
 0x07c0	0x1500	"unknown"	"Code Mercenaries Hard- und Software GmbH|IO-Warrior 40"
@@ -2798,7 +2802,7 @@
 0x0839	0x1012	"unknown"	"Samsung Techwin Co., Ltd|6500 Document Camera"
 0x0839	0x1542	"unknown"	"Samsung Aerospace Industries Ltd.|Digimax 50 Duo"
 0x083a	0x1046	"pegasus"	"Accton Technology Corp.|10/100 Ethernet"
-0x083a	0x3501	"at76c503-rfmd-acc"	""
+0x083a	0x3501	"at76_usb"	""
 0x083a	0x3503	"prism2_usb"	""
 0x083a	0x5046	"pegasus"	"Accton Technology Corp.|SpeedStream 10/100 Ethernet"
 0x083f	0xb100	"unknown"	"Global Village|TelePort V.90 Fax/Modem"
@@ -2823,8 +2827,8 @@
 0x085a	0x0009	"kaweth"	"PortGear|Ethernet Adapter"
 0x085a	0x0299	"unknown"	"Xircom|Colorvision, Inc. Monitor Spyder"
 0x085a	0x8027	"keyspan_pda"	"Xircom|PGSDB9 Serial Port"
-0x0864	0x4100	"at76c503-i3861"	"NetGear, Inc.|MA101 Wireless Adapter "
-0x0864	0x4102	"at76c503-rfmd"	"NetGear, Inc.|MA101 Wireless Adapter"
+0x0864	0x4100	"at76_usb"	"NetGear, Inc.|MA101 Wireless Adapter "
+0x0864	0x4102	"at76_usb"	"NetGear, Inc.|MA101 Wireless Adapter"
 0x086a	0x0100	"emi26"	"Emagic Soft-und Hardware GmbH|"
 0x086a	0x0110	"emi62"	""
 0x086c	0x1001	"unknown"	"DeTeWe - Deutsche Telephonwerke AG & Co.|Eumex 504PC ISDN TA"
@@ -2963,6 +2967,8 @@
 0x0ac9	0x0011	"unknown"	"Micro Solutions, Inc.|Backpack 40GB Hard Drive "
 0x0acd	0x0300	"ftdi_sio"	""
 0x0ace	0x1201	"zd1201"	""
+0x0ace	0x1211	"zd1211rw"	""
+0x0ace	0x1215	"zd1211rw"	""
 0x0aec	0x3050	"unknown"	"Neodio Technologies Corp.|ND3050 8-in-1 Card Reader"
 0x0aec	0x3260	"unknown"	"Neodio Technologies Corp.|7-in-1 Card Reader"
 0x0aec	0x5010	"unknown"	"Neodio|ND5010 Card Reader"
@@ -2977,7 +2983,7 @@
 0x0b39	0x0901	"pegasus"	""
 0x0b3b	0x1601	"prism2_usb"	"Tekram Technology Co., Ltd|Allnet 0193 802.11b Adapter"
 0x0b3b	0x1602	"prism2_usb"	"Tekram Technology Co., Ltd|ZyXEL ZyAIR B200 802.11b Adapter"
-0x0b3b	0x1612	"at76c503-i3861"	"Tekram Technology Co., Ltd.|AIR.Mate 2@net"
+0x0b3b	0x1612	"at76_usb"	"Tekram Technology Co., Ltd.|AIR.Mate 2@net"
 0x0b43	0x0003	"unknown"	"Play.com, Inc.|PS2 Controller Convertor"
 0x0b48	0x1003	"dvb-ttusb-budget"	"TechnoTrend AG|Technotrend/Hauppauge USB-Nova"
 0x0b48	0x1004	"dvb-ttusb-budget"	""
@@ -3083,7 +3089,7 @@
 0x0caf	0x3a00	"unknown"	"Buslink|Hard Drive"
 0x0ccd	0x0038	"unknown"	"TerraTec Electronic GmbH|Cinergy T^2 DVB-T Receiver"
 0x0cd4	0x0101	"unknown"	"Bang Olufsen|BeolinkPC2"
-0x0cde	0x0001	"at76c503-i3861"	""
+0x0cde	0x0001	"at76_usb"	""
 0x0cde	0x0002	"prism2_usb"	"Z-Com|XI-725/726 Prism2.5 802.11b Adapter"
 0x0cde	0x0005	"unknown"	"Z-Com|XI-735 Prism3 802.11b Adapter"
 0x0d46	0x0078	"kobil_sct"	""
@@ -3091,8 +3097,8 @@
 0x0d46	0x2011	"kobil_sct"	""
 0x0d46	0x2012	"kobil_sct"	""
 0x0d50	0x0011	"unknown"	"Cleware GmbH|USB-Temp2 Thermometer"
-0x0d5c	0xa001	"at76c503-i3861"	""
-0x0d5c	0xa002	"at76c503-rfmd-acc"	"Belkin|F5D6050 802.11b Adapter"
+0x0d5c	0xa001	"at76_usb"	""
+0x0d5c	0xa002	"at76_usb"	"Belkin|F5D6050 802.11b Adapter"
 0x0d62	0xa100	"unknown"	"Darfon Electronics Corp.|Benq Mouse"
 0x0d64	0x0107	"unknown"	"DXG Technology Corp.|Horus MT-409 Camera"
 0x0d7d	0x0100	"unknown"	"Apacer|HandyDrive 64MB"
@@ -3105,8 +3111,8 @@
 0x0d7d	0x1420	"unknown"	"Phison Electronics Corp.|PS2044 Pen Drive"
 0x0d81	0x1900	"pwc"	"TechnoVision|"
 0x0d81	0x1910	"pwc"	"TechnoVision|"
-0x0d8e	0x7100	"at76c503-i3861"	"Global Sun Technology, Inc.|Wireless 802.11b Ethernet"
-0x0d8e	0x7110	"at76c503-i3861"	""
+0x0d8e	0x7100	"at76_usb"	"Global Sun Technology, Inc.|Wireless 802.11b Ethernet"
+0x0d8e	0x7110	"at76_usb"	""
 0x0d8e	0x7a01	"prism2_usb"	"Global Sun Technology, Inc.|PRISM25 802.11b Adapter"
 0x0d96	0x3300	"unknown"	"Traveler|SX330z Digital Camera"
 0x0d96	0x4100	"unknown"	"Traveler|SX410z Digital Camera"
@@ -3115,7 +3121,7 @@
 0x0d97	0x0001	"unknown"	"Santa Barbara Instrument Group|SBIG Astronomy Camera (without firmware)"
 0x0d97	0x0101	"unknown"	"Santa Barbara Instrument Group|SBIG Astronomy Camera (with firmware)"
 0x0dab	0x0100	"unknown"	"Cubig Group|DVR/CVR-M140 MP3 Player"
-0x0db0	0x1020	"at76c505-rfmd2958"	"Micro Star International|MS6978 WLAN PC2PC 802.11b Adapter"
+0x0db0	0x1020	"at76_usb"	"Micro Star International|MS6978 WLAN PC2PC 802.11b Adapter"
 0x0db0	0x1967	"unknown"	"Micro Star International|Bluetooth Dongle"
 0x0db0	0x6823	"zd1201"	""
 0x0db0	0x6982	"unknown"	"Micro Star International|Medion Flash XL V2.7A Card Reader"
@@ -3124,7 +3130,7 @@
 0x0dcd	0x0002	"unknown"	"NetworkFab Corporation|High Bandwidth Codec"
 0x0dd0	0x1002	"unknown"	"Access Solutions|Triple Talk Speech Synthesizer"
 0x0de0	0x6823	"unknown"	"Micro Star International|UB11B"
-0x0df6	0x9071	"unknown"	"Sitecom Europe B.V.|zd1211 802.11g Adapter"
+0x0df6	0x9071	"zd1211rw"	"Sitecom Europe B.V.|zd1211 802.11g Adapter"
 0x0df7	0x0620	"pl2303"	"Mobile Action Technology, Inc.|MA-620 USB Infrared Adapter"
 0x0dfc	0x0001	"unknown"	"GeneralTouch Technology Co., Ltd.|Touchscreen"
 0x0e0c	0x0101	"unknown"	"Gesytec|LonUSB LonTalk Network Adapter"
@@ -3248,6 +3254,7 @@
 0x0ef5	0x2202	"unknown"	"PointChips|Flash Disk"
 0x0f3d	0x0112	"unknown"	"Airprime, Incorporated|CDMA 1xEVDO PC Card, PC 5220"
 0x0f4d	0x1000	"unknown"	"Microtune, Inc.|Bluetooth Dongle"
+0x0f4f	0x0050	"cdc_ether"	"Inventel|LiveBox USB"
 0x0f94	0x0001	"ftdi_sio"	""
 0x0f9c	0x0301	"unknown"	"Hyun Won, Inc.|M-Any Premium DAH-610 MP3/WMA Player"
 0x0f9c	0x0332	"unknown"	"Hyun Won, Inc.|mobiBLU DAH-1200 MP3/Ogg Player"
@@ -4149,7 +4156,7 @@
 0x1043	0x80bb	"unknown"	"ASUSTeK Computer Inc.|v9180 Magic/T [GeForce4 MX440 AGP 8x 64MB TV-out]"
 0x1044	0x1012	"unknown"	"Adaptec (formerly DPT)|Domino RAID Engine"
 0x1044	0x8002	"pegasus"	""
-0x1044	0x8003	"at76c503-rfmd"	""
+0x1044	0x8003	"at76_usb"	""
 0x1044	0x8004	"zd1201"	""
 0x1044	0xa400	"unknown"	"Adaptec (formerly DPT)|SmartCache/Raid I-IV Controller"
 0x1044	0xa500	"unknown"	"Adaptec (formerly DPT)|PCI Bridge"
@@ -6079,6 +6086,7 @@
 0x126f	0x0910	"unknown"	"Silicon Motion, Inc.|SM910"
 0x126f	0x1325	"unknown"	"TwinMOS|Mobile Disk"
 0x126f	0x2168	"unknown"	"TwinMOS|Mobile Disk III"
+0x126f	0xa006	"zd1211rw"	""
 0x1273	0x0002	"unknown"	"Hughes Network Systems|DirecPC"
 0x1274	0x1171	"unknown"	"Ensoniq|ES1373 [AudioPCI] (also Creative Labs CT5803)"
 0x1274	0x1371	"unknown"	"Ensoniq|ES1371 [AudioPCI-97]"
@@ -6181,7 +6189,7 @@
 0x12eb	0x0003	"unknown"	"Aureal Semiconductor|AU8810 Vortex Digital Audio Processor"
 0x12eb	0x8803	"unknown"	"Aureal Semiconductor|Vortex 56k Software Modem"
 0x12f8	0x0002	"unknown"	"Electronic Design GmbH|VideoMaker"
-0x12fd	0x1001	"at76c505-rfmd2958"	"AIN Comm. Technology Co., Ltd|AWU2000b 802.11b Stick"
+0x12fd	0x1001	"at76_usb"	"AIN Comm. Technology Co., Ltd|AWU2000b 802.11b Stick"
 0x1307	0x0001	"unknown"	"Measurement Computing|PCI-DAS1602/16"
 0x1307	0x000b	"unknown"	"Measurement Computing|PCI-DIO48H"
 0x1307	0x000c	"unknown"	"Measurement Computing|PCI-PDISO8"
@@ -6341,11 +6349,11 @@
 0x1360	0x0301	"unknown"	"Meinberg Funkuhren|TCR510PCI IRIG Receiver"
 0x136b	0xff01	"unknown"	"Kawasaki Steel Corporation|KL5A72002 Motion JPEG"
 0x1370	0x6828	"unknown"	"Swissbit|Victorinox Flash Drive"
-0x1371	0x0002	"at76c503-rfmd"	""
-0x1371	0x0013	"at76c505-rfmd2958"	""
-0x1371	0x0014	"at76c505-rfmd2958"	""
+0x1371	0x0002	"at76_usb"	""
+0x1371	0x0013	"at76_usb"	""
+0x1371	0x0014	"at76_usb"	""
 0x1371	0x434e	"unknown"	"CNet Technology Inc|GigaCard Network Adapter"
-0x1371	0x5743	"at76c503-rfmd"	""
+0x1371	0x5743	"at76_usb"	""
 0x137a	0x0001	"unknown"	"Mark of the Unicorn Inc|PCI-324 Audiowire Interface"
 0x1382	0x0001	"unknown"	"Marian - Electronic & Software|ARC88 audio recording card"
 0x1382	0x2088	"unknown"	"Marian - Electronic & Software|Marc-8 MIDI 8 channel audio card"
@@ -6793,6 +6801,8 @@
 0x1571	0xa205	"unknown"	"Contemporary Controls|CCSI PCI22-FOG_ST 10Mbit ARCnet"
 0x1571	0xa206	"unknown"	"Contemporary Controls|CCSI PCI22-THB 10Mbit ARCnet"
 0x157c	0x8001	"unknown"	"Eurosoft (UK)|Fix2000 PCI Y2K Compliance Card"
+0x157e	0x300b	"zd1211rw"	""
+0x157e	0x300d	"zd1211rw"	""
 0x1592	0x0781	"unknown"	"Syba Tech Ltd|Multi-IO Card"
 0x1592	0x0782	"unknown"	"Syba Tech Ltd|Parallel Port Card 2xEPP"
 0x1592	0x0783	"unknown"	"Syba Tech Ltd|Multi-IO Card"
@@ -6904,7 +6914,7 @@
 0x1668	0x0408	"prism2_usb"	"Actiontec Electronics, Inc.|USB Wireless Adapter"
 0x1668	0x0421	"prism2_usb"	"Actiontec Electronics, Inc.|Prism2.5 802.11b Adapter"
 0x1668	0x6106	"prism2_usb"	""
-0x1668	0x7605	"at76c503-rfmd"	""
+0x1668	0x7605	"at76_usb"	""
 0x166d	0x0001	"unknown"	"Broadcom Corporation|SiByte BCM1125/1125H/1250 System-on-a-Chip PCI"
 0x166d	0x0002	"unknown"	"Broadcom Corporation|SiByte BCM1125H/1250 System-on-a-Chip HyperTransport"
 0x1677	0x104e	"unknown"	"Bernecker + Rainer|5LS172.6 B&R Dual CAN Interface Card"
@@ -6920,6 +6930,7 @@
 0x1690	0x0103	"unknown"	"Creative Labs [hex]|Askey 1456 VQE-R3 Modem [conexant]"
 0x1690	0x0109	"unknown"	"Askey Computer Corp. [hex]|Askey MagicXpress V.90 Pocket Modem [conexant]"
 0x1690	0x0601	"ipaq"	""
+0x1690	0x0701	"at76_usb"	""
 0x16ab	0x1100	"unknown"	"Global Sun Technology Inc|GL24110P"
 0x16ab	0x1101	"unknown"	"Global Sun Technology Inc|PLX9052 PCMCIA-to-PCI Wireless LAN"
 0x16ab	0x1102	"unknown"	"Global Sun Technology Inc|PCMCIA-to-PCI Wireless Network Bridge"
@@ -6991,7 +7002,7 @@
 0x18f7	0x0004	"unknown"	"Commtech, Inc.|Fastcom 422/2-PCI-335"
 0x18f7	0x0005	"unknown"	"Commtech, Inc.|Fastcom IGESCC-PCI-ISO/1"
 0x18f7	0x000a	"unknown"	"Commtech, Inc.|Fastcom 232/4-PCI-335"
-0x1915	0x2233	"at76c505-rfmd2958"	""
+0x1915	0x2233	"at76_usb"	""
 0x1a08	0x0000	"unknown"	"Sierra semiconductor|SC15064"
 0x1a0a	0xbadd	"unknown"	"...|USB OTG Compliance test device"
 0x1c1c	0x0001	"unknown"	"Symphony|82C101"
@@ -7003,7 +7014,7 @@
 0x1fc0	0x0300	"unknown"	"Tumsan Oy|E2200 Dual E1/Rawpipe Card"
 0x2001	0x1a00	"usbnet"	""
 0x2001	0x200c	"pegasus"	"D-Link Corp|USB Network Adapter"
-0x2001	0x3200	"at76c503-rfmd"	"D-Link Corp. [hex]|DWL-120 802.11b (Atmel RFMD503A) [usbvnetr]"
+0x2001	0x3200	"at76_usb"	"D-Link Corp. [hex]|DWL-120 802.11b (Atmel RFMD503A) [usbvnetr]"
 0x2001	0x3700	"prism2_usb"	"D-Link Corp. [hex]|DWL-122 802.11b"
 0x2001	0x4000	"kaweth"	"D-Link Corp|DSB-650C Ethernet [klsi]"
 0x2001	0x4001	"pegasus"	"D-Link Corp|DSB-650TX Ethernet (?) [pegasus]"
@@ -7013,7 +7024,7 @@
 0x2001	0x4102	"pegasus"	"D-Link Corp|USB Network Adapter"
 0x2001	0xabc1	"pegasus"	"D-Link Corp|USB Network Adapter"
 0x2001	0xf013	"unknown"	"D-Link Corp. [hex]|DLink 7 port USB2.0 Hub"
-0x2019	0x3220	"at76c503-rfmd"	""
+0x2019	0x3220	"at76_usb"	""
 0x2040	0x9300	"unknown"	"Hauppauge|Hauppauge WinTV NOVA-T USB2 (cold)"
 0x2040	0x9301	"unknown"	"Hauppauge|Hauppauge WinTV NOVA-T USB2 (warm)"
 0x2162	0x500c	"unknown"	"Creative (?)|DE5771 Modem Blaster"
@@ -7262,6 +7273,7 @@
 0x6666	0x0001	"unknown"	"Decision Computer International Co.|PCCOM4"
 0x6666	0x0002	"unknown"	"Decision Computer International Co.|PCCOM8"
 0x6666	0x0667	"unknown"	"Eclectic VG|SmartJoy PSX"
+0x6891	0xa727	"zd1211rw"	""
 0x6993	0xb001	"unknown"	"Freshtel|FT-102 VoIP USB Phone "
 0x8008	0x0010	"unknown"	"Quancom Electronic GmbH|WDOG1 [PCI-Watchdog 1]"
 0x8008	0x0011	"unknown"	"Quancom Electronic GmbH|PWDOG2 [PCI-Watchdog 2]"
@@ -7270,7 +7282,7 @@
 0x8086	0x0039	"unknown"	"Intel Corporation|21145 Fast Ethernet"
 0x8086	0x0110	"unknown"	"Intel Corp.|Easy PC Camera"
 0x8086	0x0122	"unknown"	"Intel Corporation|82437FX"
-0x8086	0x0200	"at76c503-i3861"	""
+0x8086	0x0200	"at76_usb"	""
 0x8086	0x0309	"unknown"	"Intel Corporation|80303 I/O Processor PCI-to-PCI Bridge"
 0x8086	0x030d	"unknown"	"Intel Corporation|80312 I/O Companion Chip PCI-to-PCI Bridge"
 0x8086	0x0326	"unknown"	"Intel Corporation|6700/6702PXH I/OxAPIC Interrupt Controller A"