kill snd-usb-audio and usb-storage entries

1 files changed, 0 insertions, 308 deletions

diff --git a/lst/usbtable b/lst/usbtable
index dd273980..ef6da9e6 100644
--- a/lst/usbtable
+++ b/lst/usbtable
@@ -44,7 +44,6 @@
 0x0003	0x0411	0x0027	0x0000	"prism2_usb"	""
 0x0003	0x0411	0x003d	0x0000	"usbnet"	""
 0x0003	0x0411	0x0044	0x0000	"prism2_usb"	""
-0x0003	0x041e	0x3010	0x0000	"snd-usb-audio"	""
 0x0003	0x041e	0x4003	0x0000	"w9968cf"	""
 0x0003	0x041e	0x400c	0x0000	"pwc"	""
 0x0003	0x041e	0x4011	0x0000	"pwc"	""
@@ -61,7 +60,6 @@
 0x0003	0x045e	0x006e	0x0000	"prism2_usb"	""
 0x0003	0x045e	0x007a	0x0000	"pegasus"	""
 0x0003	0x045e	0x00ce	0x0000	"ipaq"	""
-0x0003	0x045e	0x0283	0x0000	"snd-usb-audio"	""
 0x0003	0x045e	0x0289	0x0000	"xpad"	"Microsoft Xbox Controller S"
 0x0003	0x045e	0x0400	0x0000	"ipaq"	""
 0x0003	0x045e	0x0401	0x0000	"ipaq"	""
@@ -221,79 +219,7 @@
 0x0003	0x047d	"se401"	""
 0x0003	0x047e	0x1001	0x0000	"uss720"	""
 0x0003	0x0483	"ISDN:hisax_st5481"	""
-0x0003	0x0499	0x1000	0x0000	"snd-usb-audio"	""
 0x0003	0x0499	0x1001	0x0000	"usb-midi"	""
-0x0003	0x0499	0x1002	0x0000	"snd-usb-audio"	""
-0x0003	0x0499	0x1003	0x0000	"snd-usb-audio"	""
-0x0003	0x0499	0x1005	0x0000	"snd-usb-audio"	""
-0x0003	0x0499	0x1006	0x0000	"snd-usb-audio"	""
-0x0003	0x0499	0x1007	0x0000	"snd-usb-audio"	""
-0x0003	0x0499	0x1008	0x0000	"snd-usb-audio"	""
-0x0003	0x0499	0x1009	0x0000	"snd-usb-audio"	""
-0x0003	0x0499	0x100c	0x0000	"snd-usb-audio"	""
-0x0003	0x0499	0x100d	0x0000	"snd-usb-audio"	""
-0x0003	0x0499	0x100e	0x0000	"snd-usb-audio"	""
-0x0003	0x0499	0x100f	0x0000	"snd-usb-audio"	""
-0x0003	0x0499	0x1010	0x0000	"snd-usb-audio"	""
-0x0003	0x0499	0x1011	0x0000	"snd-usb-audio"	""
-0x0003	0x0499	0x1012	0x0000	"snd-usb-audio"	""
-0x0003	0x0499	0x1013	0x0000	"snd-usb-audio"	""
-0x0003	0x0499	0x1014	0x0000	"snd-usb-audio"	""
-0x0003	0x0499	0x1015	0x0000	"snd-usb-audio"	""
-0x0003	0x0499	0x1017	0x0000	"snd-usb-audio"	""
-0x0003	0x0499	0x1018	0x0000	"snd-usb-audio"	""
-0x0003	0x0499	0x1019	0x0000	"snd-usb-audio"	""
-0x0003	0x0499	0x101a	0x0000	"snd-usb-audio"	""
-0x0003	0x0499	0x101b	0x0000	"snd-usb-audio"	""
-0x0003	0x0499	0x101c	0x0000	"snd-usb-audio"	""
-0x0003	0x0499	0x101d	0x0000	"snd-usb-audio"	""
-0x0003	0x0499	0x101e	0x0000	"snd-usb-audio"	""
-0x0003	0x0499	0x1020	0x0000	"snd-usb-audio"	""
-0x0003	0x0499	0x1021	0x0000	"snd-usb-audio"	""
-0x0003	0x0499	0x1022	0x0000	"snd-usb-audio"	""
-0x0003	0x0499	0x1023	0x0000	"snd-usb-audio"	""
-0x0003	0x0499	0x1024	0x0000	"snd-usb-audio"	""
-0x0003	0x0499	0x1025	0x0000	"snd-usb-audio"	""
-0x0003	0x0499	0x1026	0x0000	"snd-usb-audio"	""
-0x0003	0x0499	0x1027	0x0000	"snd-usb-audio"	""
-0x0003	0x0499	0x1028	0x0000	"snd-usb-audio"	""
-0x0003	0x0499	0x1029	0x0000	"snd-usb-audio"	""
-0x0003	0x0499	0x102a	0x0000	"snd-usb-audio"	""
-0x0003	0x0499	0x102b	0x0000	"snd-usb-audio"	""
-0x0003	0x0499	0x102e	0x0000	"snd-usb-audio"	""
-0x0003	0x0499	0x1030	0x0000	"snd-usb-audio"	""
-0x0003	0x0499	0x1031	0x0000	"snd-usb-audio"	""
-0x0003	0x0499	0x1032	0x0000	"snd-usb-audio"	""
-0x0003	0x0499	0x1033	0x0000	"snd-usb-audio"	""
-0x0003	0x0499	0x1034	0x0000	"snd-usb-audio"	""
-0x0003	0x0499	0x1035	0x0000	"snd-usb-audio"	""
-0x0003	0x0499	0x1036	0x0000	"snd-usb-audio"	""
-0x0003	0x0499	0x1037	0x0000	"snd-usb-audio"	""
-0x0003	0x0499	0x1038	0x0000	"snd-usb-audio"	""
-0x0003	0x0499	0x1039	0x0000	"snd-usb-audio"	""
-0x0003	0x0499	0x103a	0x0000	"snd-usb-audio"	""
-0x0003	0x0499	0x103b	0x0000	"snd-usb-audio"	""
-0x0003	0x0499	0x103c	0x0000	"snd-usb-audio"	""
-0x0003	0x0499	0x2000	0x0000	"snd-usb-audio"	""
-0x0003	0x0499	0x2001	0x0000	"snd-usb-audio"	""
-0x0003	0x0499	0x2002	0x0000	"snd-usb-audio"	""
-0x0003	0x0499	0x5000	0x0000	"snd-usb-audio"	""
-0x0003	0x0499	0x5001	0x0000	"snd-usb-audio"	""
-0x0003	0x0499	0x5002	0x0000	"snd-usb-audio"	""
-0x0003	0x0499	0x5003	0x0000	"snd-usb-audio"	""
-0x0003	0x0499	0x5004	0x0000	"snd-usb-audio"	""
-0x0003	0x0499	0x5005	0x0000	"snd-usb-audio"	""
-0x0003	0x0499	0x5006	0x0000	"snd-usb-audio"	""
-0x0003	0x0499	0x5007	0x0000	"snd-usb-audio"	""
-0x0003	0x0499	0x5008	0x0000	"snd-usb-audio"	""
-0x0003	0x0499	0x5009	0x0000	"snd-usb-audio"	""
-0x0003	0x0499	0x500a	0x0000	"snd-usb-audio"	""
-0x0003	0x0499	0x500b	0x0000	"snd-usb-audio"	""
-0x0003	0x0499	0x500c	0x0000	"snd-usb-audio"	""
-0x0003	0x0499	0x500d	0x0000	"snd-usb-audio"	""
-0x0003	0x0499	0x500e	0x0000	"snd-usb-audio"	""
-0x0003	0x0499	0x7000	0x0000	"snd-usb-audio"	""
-0x0003	0x0499	0x7010	0x0000	"snd-usb-audio"	""
 0x0003	0x049f	0x0003	0x0000	"ipaq"	""
 0x0003	0x049f	0x0032	0x0000	"at76c503-rfmd"	""
 0x0003	0x049f	0x0033	0x0000	"prism2_usb"	""
@@ -399,39 +325,11 @@
 0x0003	0x056e	0xabc1	0x0000	"pegasus"	""
 0x0003	0x057c	0x2200	0x0000	"bfusb"	""
 0x0003	0x057c	0x3800	0x0000	"hci_usb"	""
-0x0003	0x0582	0x0002	0x0000	"snd-usb-audio"	""
 0x0003	0x0582	0x0003	0x0000	"usb-midi"	""
-0x0003	0x0582	0x0004	0x0000	"snd-usb-audio"	""
 0x0003	0x0582	0x0005	0x0000	"usb-midi"	""
 0x0003	0x0582	0x0007	0x0000	"usb-midi"	""
 0x0003	0x0582	0x0008	0x0000	"usb-midi"	""
 0x0003	0x0582	0x0009	0x0000	"usb-midi"	""
-0x0003	0x0582	0x000b	0x0000	"snd-usb-audio"	""
-0x0003	0x0582	0x000c	0x0000	"snd-usb-audio"	""
-0x0003	0x0582	0x0010	0x0000	"snd-usb-audio"	""
-0x0003	0x0582	0x0012	0x0000	"snd-usb-audio"	""
-0x0003	0x0582	0x0014	0x0000	"snd-usb-audio"	""
-0x0003	0x0582	0x0016	0x0000	"snd-usb-audio"	""
-0x0003	0x0582	0x001b	0x0000	"snd-usb-audio"	""
-0x0003	0x0582	0x001d	0x0000	"snd-usb-audio"	""
-0x0003	0x0582	0x0023	0x0000	"snd-usb-audio"	""
-0x0003	0x0582	0x0025	0x0000	"snd-usb-audio"	""
-0x0003	0x0582	0x0027	0x0000	"snd-usb-audio"	""
-0x0003	0x0582	0x0029	0x0000	"snd-usb-audio"	""
-0x0003	0x0582	0x002d	0x0000	"snd-usb-audio"	""
-0x0003	0x0582	0x002f	0x0000	"snd-usb-audio"	""
-0x0003	0x0582	0x0033	0x0000	"snd-usb-audio"	""
-0x0003	0x0582	0x0037	0x0000	"snd-usb-audio"	""
-0x0003	0x0582	0x0040	0x0000	"snd-usb-audio"	""
-0x0003	0x0582	0x0042	0x0000	"snd-usb-audio"	""
-0x0003	0x0582	0x0044	0x0000	"snd-usb-audio"	""
-0x0003	0x0582	0x0048	0x0000	"snd-usb-audio"	""
-0x0003	0x0582	0x004d	0x0000	"snd-usb-audio"	""
-0x0003	0x0582	0x0050	0x0000	"snd-usb-audio"	""
-0x0003	0x0582	0x0052	0x0000	"snd-usb-audio"	""
-0x0003	0x0582	0x0065	0x0000	"snd-usb-audio"	""
-0x0003	0x0582	0x006d	0x0000	"snd-usb-audio"	""
-0x0003	0x0582	0x0075	0x0000	"snd-usb-audio"	""
 0x0003	0x0582	"usb-midi"	""
 0x0003	0x0584	0xb000	0x0000	"pl2303"	""
 0x0003	0x0586	0x1000	0x0000	"omninet"	""
@@ -604,9 +502,6 @@
 0x0003	0x085a	0x8027	0x0000	"keyspan_pda"	""
 0x0003	0x0864	0x4100	0x0000	"at76c503-i3861"	""
 0x0003	0x0864	0x4102	0x0000	"at76c503-rfmd"	""
-0x0003	0x086a	0x0001	0x0000	"snd-usb-audio"	""
-0x0003	0x086a	0x0002	0x0000	"snd-usb-audio"	""
-0x0003	0x086a	0x0003	0x0000	"snd-usb-audio"	""
 0x0003	0x086a	0x0100	0x0000	"emi26"	""
 0x0003	0x086a	0x0110	0x0000	"emi62"	""
 0x0003	0x0870	0x0001	0x0000	"ISDN:cdc-acm"	""
@@ -772,7 +667,6 @@
 0x0003	0x15f4	0x0001	0x0000	"dvb-usb-umt-010"	""
 0x0003	0x15f4	0x0015	0x0000	"dvb-usb-umt-010"	""
 0x0003	0x15f4	"dvb-dibusb"	""
-0x0003	0x1604	"snd-usb-usx2y"	""
 0x0003	0x1608	0x0001	0x0000	"io_edgeport"	""
 0x0003	0x1608	0x0002	0x0000	"io_edgeport"	""
 0x0003	0x1608	0x0003	0x0000	"io_edgeport"	""
@@ -900,65 +794,9 @@
 0x0003	0xeb1a	0x17df	0x0000	"dvb-usb-dibusb-mb"	""
 0x0003	0xeb1a	"dvb-dibusb"	""
 0x0003	0xfff0	0xfff0	0x0000	"usbtest"	""
-0x000f	0x03ee	0x6901	0x0000	"usb-storage"	""
-0x000f	0x03f0	"usb-storage"	""
-0x000f	0x0402	0x5621	0x0103	"usb-storage"	""
 0x000f	0x0403	"ftdi_sio"	""
-0x000f	0x0411	0x001c	0x0113	"usb-storage"	""
-0x000f	0x0436	0x0005	0x0100	"usb-storage"	""
-0x000f	0x0482	"usb-storage"	""
-0x000f	0x04a4	0x0004	0x0001	"usb-storage"	""
-0x000f	0x04b8	"usb-storage"	""
-0x000f	0x04cb	0x0100	0x0000	"usb-storage"	""
-0x000f	0x04ce	0x0002	0x0074	"usb-storage"	""
-0x000f	0x04da	"usb-storage"	""
-0x000f	0x04e6	"usb-storage"	""
-0x000f	0x04fc	0x80c2	0x0100	"usb-storage"	""
-0x000f	0x050d	0x0115	0x0133	"usb-storage"	""
-0x000f	0x0525	0xa140	0x0100	"usb-storage"	""
 0x000f	0x0525	0xa4a2	0x0203	"usbnet"	""
-0x000f	0x052b	"usb-storage"	""
 0x000f	0x0545	"ibmcam"	""
-0x000f	0x054c	"usb-storage"	""
-0x000f	0x057b	"usb-storage"	""
-0x000f	0x0595	0x4343	0x0000	"usb-storage"	""
-0x000f	0x059f	0xa601	0x0200	"usb-storage"	""
-0x000f	0x05ab	"usb-storage"	""
-0x000f	0x05ac	0x1203	0x0001	"usb-storage"	""
-0x000f	0x05dc	"usb-storage"	""
-0x000f	0x05e3	"usb-storage"	""
-0x000f	0x0636	0x0003	0x0000	"usb-storage"	""
-0x000f	0x0644	0x0000	0x0100	"usb-storage"	""
-0x000f	0x066b	0x0105	0x0100	"usb-storage"	""
-0x000f	0x066f	0x8000	0x0001	"usb-storage"	""
-0x000f	0x067b	0x3507	0x0001	"usb-storage"	""
-0x000f	0x0686	"usb-storage"	""
-0x000f	0x0693	"usb-storage"	""
-0x000f	0x0763	0x1031	0x0100	"snd-usb-audio"	""
-0x000f	0x0781	"usb-storage"	""
-0x000f	0x07ab	"usb-storage"	""
-0x000f	0x07af	"usb-storage"	""
-0x000f	0x07c4	"usb-storage"	""
-0x000f	0x07cf	0x1001	0x1000	"usb-storage"	""
-0x000f	0x0839	0x000a	0x0001	"usb-storage"	""
-0x000f	0x084d	0x0011	0x0110	"usb-storage"	""
-0x000f	0x08ca	"usb-storage"	""
-0x000f	0x090a	"usb-storage"	""
-0x000f	0x090c	0x1132	0x0000	"usb-storage"	""
-0x000f	0x097a	0x0001	0x0000	"usb-storage"	""
-0x000f	0x0a16	0x8888	0x0100	"usb-storage"	""
-0x000f	0x0a17	"usb-storage"	""
-0x000f	0x0bf6	0xa001	0x0100	"usb-storage"	""
-0x000f	0x0c0b	0xa109	0x0000	"usb-storage"	""
-0x000f	0x0d96	"usb-storage"	""
-0x000f	0x0dd8	0x1060	0x0000	"usb-storage"	""
-0x000f	0x0dda	0x0001	0x0012	"usb-storage"	""
-0x000f	0x0ea0	"usb-storage"	""
-0x000f	0x0ed1	0x6660	0x0100	"usb-storage"	""
-0x000f	0x1019	0x0c55	0x0000	"usb-storage"	""
-0x000f	0x1065	0x2136	0x0000	"usb-storage"	""
-0x000f	0x1370	0x6828	0x0110	"usb-storage"	""
-0x000f	0x55aa	0xa103	0x0000	"usb-storage"	""
 0x0010	0x0000	"usbcore"	""
 0x002e	0x0200	"unknown"	"Metro|Metrologic Scanner"
 0x0070	0x0000	"usblp"	""
@@ -967,11 +805,6 @@
 0x0070	0x4009	"unknown"	"Hauppauge computer works Inc.|WinTV PVR-250"
 0x0070	0x4801	"unknown"	"Hauppauge computer works Inc.|WinTV PVR-250 MCE"
 0x0080	0x0000	"usbhid"	""
-0x0083	0x0499	"snd-usb-audio"	""
-0x0083	0x0582	"snd-usb-audio"	""
-0x0083	0x0763	"snd-usb-audio"	""
-0x0083	0x0ccd	0x0013	0x0000	"snd-usb-audio"	""
-0x0083	0x1235	"snd-usb-audio"	""
 0x0095	0x0680	"unknown"	"Silicon Image, Inc. (Wrong ID)|Ultra ATA/133 IDE RAID CONTROLLER CARD"
 0x0104	0x00be	"ipaq"	""
 0x0180	0x0000	"irda-usb"	""
@@ -1005,7 +838,6 @@
 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"
 0x03ee	0x6901	"Removable:floppy"	"Mitsumi|USB FDD"
@@ -1014,7 +846,6 @@
 0x03f0	0x0102	"scanner"	"Hewlett-Packard|PhotoSmart S20"
 0x03f0	0x0104	"unknown"	"Hewlett-Packard|DeskJet 880c"
 0x03f0	0x0105	"scanner"	"Hewlett-Packard|ScanJet 4200C"
-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	"at76_usb"	"Hewlett-Packard|hn210w 802.11b Wireless Ethernet"
@@ -1023,11 +854,9 @@
 0x03f0	0x0202	"unknown"	"Hewlett-Packard|PhotoSmart S20"
 0x03f0	0x0204	"unknown"	"Hewlett-Packard|DeskJet 815c"
 0x03f0	0x0205	"scanner"	"Hewlett-Packard|ScanJet 3300C"
-0x03f0	0x0207	"usb-storage"	"Hewlett-Packard|CD-Writer Plus 8200e/Mesa"
 0x03f0	0x020c	"unknown"	"Hewlett-Packard|Multimedia Keyboard Hub"
 0x03f0	0x0304	"unknown"	"Hewlett-Packard|DeskJet 812c"
 0x03f0	0x0305	"scanner"	"Hewlett-Packard|ScanJet 4300C"
-0x03f0	0x0307	"usb-storage"	"Hewlett-Packard|CD-Writer Plus CD-4e"
 0x03f0	0x0311	"unknown"	"Hewlett-Packard|OfficeJet G85xi"
 0x03f0	0x0317	"unknown"	"Hewlett-Packard|LaserJet 1200"
 0x03f0	0x0401	"scanner"	"Hewlett-Packard|ScanJet 5200C"
@@ -1249,7 +1078,6 @@
 0x041e	0x1002	"unknown"	"Creative Labs|Nomad II MP3 Player"
 0x041e	0x1003	"unknown"	"Creative Labs|Blaster GamePad Cobra"
 0x041e	0x1050	"unknown"	"Creative Labs|GamePad Cobra"
-0x041e	0x3010	"snd-usb-audio"	""
 0x041e	0x3020	"unknown"	"Creative Technology, Ltd|SoundBlaster Audigy 2 NX"
 0x041e	0x4003	"w9968cf"	"Creative Labs|VideoBlaster WebCam Go Plus [W9967CF]"
 0x041e	0x4004	"unknown"	"Creative Labs|Nomad II MG MP3 Player"
@@ -1328,13 +1156,11 @@
 0x044f	0xb203	"unknown"	"ThrustMaster, Inc.|360 Modena Pro Wheel"
 0x044f	0xb300	"unknown"	"ThrustMaster, Inc.|Firestorm Dual Power"
 0x044f	0xb304	"unknown"	"ThrustMaster, Inc.|Firestorm Dual Power"
-0x0451	0x0005	"usb-storage"	"Frontier Labs|Nex II Digital"
 0x0451	0x1428	"unknown"	"Texas Instruments|Hub"
 0x0451	0x1446	"unknown"	"Texas Instruments|TUSB2040 Hub"
 0x0451	0x2036	"unknown"	"Texas Instruments|TUSB2036 Hub"
 0x0451	0x2046	"unknown"	"Texas Instruments|TUSB2046 Hub"
 0x0451	0x2077	"unknown"	"Texas Instruments|TUSB2077 Hub"
-0x0451	0x5409	"usb-storage"	"Frontier Labs|Nex II Digital"
 0x0451	0x6000	"unknown"	"Texas Instruments, Inc.|AU5 ADSL Modem (pre-reenum)"
 0x0451	0x6001	"unknown"	"Texas Instruments, Inc.|AU5 ADSL Modem"
 0x0451	0xe001	"tiglusb"	"Texas Instruments, Inc.|GraphLink"
@@ -1566,74 +1392,7 @@
 0x0483	0x7554	"slusb"	"SGS Thomson Microelectronics|56k SoftModem"
 0x0489	0x0502	"unknown"	"Foxconn / Hon Hai|SmartMedia Card Reader Firmware Loader"
 0x0489	0x0503	"unknown"	"Foxconn / Hon Hai|SmartMedia Card Reader"
-0x0499	0x1000	"snd-usb-audio"	""
-0x0499	0x1001	"snd-usb-audio"	""
-0x0499	0x1002	"snd-usb-audio"	""
-0x0499	0x1003	"snd-usb-audio"	""
-0x0499	0x1005	"snd-usb-audio"	""
-0x0499	0x1006	"snd-usb-audio"	""
-0x0499	0x1007	"snd-usb-audio"	""
-0x0499	0x1008	"snd-usb-audio"	""
-0x0499	0x1009	"snd-usb-audio"	""
-0x0499	0x100e	"snd-usb-audio"	""
-0x0499	0x100f	"snd-usb-audio"	""
-0x0499	0x1010	"snd-usb-audio"	""
-0x0499	0x1011	"snd-usb-audio"	""
-0x0499	0x1012	"snd-usb-audio"	""
-0x0499	0x1013	"snd-usb-audio"	""
-0x0499	0x1014	"snd-usb-audio"	""
-0x0499	0x1015	"snd-usb-audio"	""
-0x0499	0x1017	"snd-usb-audio"	""
-0x0499	0x1018	"snd-usb-audio"	""
-0x0499	0x1019	"snd-usb-audio"	""
-0x0499	0x101a	"snd-usb-audio"	""
-0x0499	0x101b	"snd-usb-audio"	""
-0x0499	0x101c	"snd-usb-audio"	""
-0x0499	0x101e	"snd-usb-audio"	""
-0x0499	0x1020	"snd-usb-audio"	""
-0x0499	0x1021	"snd-usb-audio"	""
-0x0499	0x1022	"snd-usb-audio"	""
-0x0499	0x1023	"snd-usb-audio"	""
-0x0499	0x1024	"snd-usb-audio"	""
-0x0499	0x1025	"snd-usb-audio"	""
-0x0499	0x1026	"snd-usb-audio"	""
-0x0499	0x1027	"snd-usb-audio"	""
-0x0499	0x1028	"snd-usb-audio"	""
-0x0499	0x1029	"snd-usb-audio"	""
-0x0499	0x102a	"snd-usb-audio"	""
-0x0499	0x102b	"snd-usb-audio"	""
-0x0499	0x102e	"snd-usb-audio"	""
-0x0499	0x1030	"snd-usb-audio"	""
-0x0499	0x1031	"snd-usb-audio"	""
-0x0499	0x1032	"snd-usb-audio"	""
-0x0499	0x1033	"snd-usb-audio"	""
-0x0499	0x1034	"snd-usb-audio"	""
-0x0499	0x1035	"snd-usb-audio"	""
-0x0499	0x1036	"snd-usb-audio"	""
-0x0499	0x1037	"snd-usb-audio"	""
-0x0499	0x1038	"snd-usb-audio"	""
-0x0499	0x1039	"snd-usb-audio"	""
-0x0499	0x103a	"snd-usb-audio"	""
-0x0499	0x103b	"snd-usb-audio"	""
-0x0499	0x103c	"snd-usb-audio"	""
-0x0499	0x2000	"snd-usb-audio"	""
-0x0499	0x2001	"snd-usb-audio"	""
-0x0499	0x2002	"snd-usb-audio"	""
-0x0499	0x5000	"snd-usb-audio"	""
-0x0499	0x5001	"snd-usb-audio"	""
-0x0499	0x5002	"snd-usb-audio"	""
-0x0499	0x5003	"snd-usb-audio"	""
-0x0499	0x5004	"snd-usb-audio"	""
-0x0499	0x5005	"snd-usb-audio"	""
-0x0499	0x5006	"snd-usb-audio"	""
-0x0499	0x5007	"snd-usb-audio"	""
-0x0499	0x5008	"snd-usb-audio"	""
-0x0499	0x500a	"snd-usb-audio"	""
-0x0499	0x500b	"snd-usb-audio"	""
-0x0499	0x500c	"snd-usb-audio"	""
 0x0499	0x6001	"unknown"	"Yamaha Corp.|CRW2200UX Lightspeed 2 External CD-RW Drive"
-0x0499	0x7000	"snd-usb-audio"	""
-0x0499	0x7010	"snd-usb-audio"	""
 0x049c	0x0002	"unknown"	"Acer Advanced Labs, Inc.|Keyboard (???)"
 0x049f	0x0003	"ipaq"	"Compaq Computer Corp.|iPAQ PocketPC"
 0x049f	0x000e	"unknown"	"Compaq Computer Corp.|Internet Keyboard"
@@ -1645,7 +1404,6 @@
 0x049f	0x0076	"prism2_usb"	"Compaq Computer Corp.|801.11b Adapter"
 0x049f	0x505a	"usbnet"	"Compaq Computer Corp.|Netowrk Interface"
 0x049f	0x8511	"pegasus"	"Compaq Computer Corp.|iPAQ Networking 10/100 Ethernet"
-0x04a4	0x0004	"usb-storage"	"Hitachi|DVD-CAM DZ-MV100A Camcorder"
 0x04a5	0x0001	"unknown"	"Acer Peripherals Inc.|Keyboard"
 0x04a5	0x12a6	"unknown"	"Acer Peripherals Inc.|AcerScan C310U"
 0x04a5	0x1a20	"scanner"	"Acer Peripherals Inc.|Prisa 310U"
@@ -1883,7 +1641,6 @@
 0x04cc	0x1122	"unknown"	"Philips Semiconductors|Hub"
 0x04cc	0x1521	"unknown"	"Philips Semiconductors|USB 2.0 Hub"
 0x04cc	0x8116	"pwc"	"Philips Semiconductors|Camera"
-0x04ce	0x0002	"usb-storage"	"ScanLogic Corp.|SL11R-IDE [IDE Bridge]"
 0x04ce	0x0300	"microtek"	"ScanLogic Corp.|"
 0x04cf	0x8818	"unknown"	"Myson Century, Inc.|Fast 3.5'' External Storage"
 0x04d2	0x0311	"unknown"	"Altec Lansing Technologies|ADA-310 Speakers"
@@ -1904,16 +1661,9 @@
 0x04dd	0x9050	"unknown"	"Sharp Corp.|Zaurus C-860 PDA"
 0x04e1	0x0201	"unknown"	"Iiyama North America Inc.|Monitor Hub"
 0x04e6	0x0001	"unknown"	"SCM Microsystems|E-USB ATA Bridge"
-0x04e6	0x0002	"usb-storage"	"Shuttle Technology Inc.|E-USCSI Bridge"
 0x04e6	0x0003	"Removable:memory_card"	"Shuttle Technology Inc.|eUSB SmartMedia Card Reader / ImageMate SDDR09"
 0x04e6	0x0005	"Removable:memory_card"	"Shuttle Technology Inc.|eUSB SmartMedia/CompactFlash Card Reader"
-0x04e6	0x0006	"usb-storage"	"Shuttle Technology Inc.|eUSB MultiMedia Card Reader / eUSB MMC Adapter"
-0x04e6	0x0007	"usb-storage"	"Shuttle Technology Inc.|Hifd"
-0x04e6	0x0009	"usb-storage"	"Shuttle Technology Inc.|eUSB ATA/ATAPI Adapter"
 0x04e6	0x000a	"Removable:memory_card"	"Shuttle Technology Inc.|eUSB CompactFlash Adapter"
-0x04e6	0x000b	"usb-storage"	"Shuttle Technology Inc.|eUSCSI Bridge"
-0x04e6	0x000c	"usb-storage"	"Shuttle Technology Inc.|eUSCSI Bridge"
-0x04e6	0x0101	"usb-storage"	"Shuttle Technology Inc.|CD-RW Devicee"
 0x04e6	0x0325	"unknown"	"Shuttle Technology Inc.|eUSB ORCA Quad Reader"
 0x04e6	0x1010	"Removable:memory_card"	"Shuttle Technology Inc.|USBAT-2 CompactFlash Card Reader"
 0x04e6	0x5111	"unknown"	"SCM Microsystems, Inc.|SCR331-DI SmartCard Reader"
@@ -1967,7 +1717,6 @@
 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"
-0x050d	0x0115	"usb-storage"	"Belkin Components|SCSI Adapter"
 0x050d	0x0121	"pegasus"	"Belkin Components|F5D5050 100Mbps Ethernet"
 0x050d	0x0208	"usbvision"	"Belkin Components|USBView II Video Adapter"
 0x050d	0x0224	"unknown"	"Belkin Components|F5U224 USB 2.0 4-Port Hub"
@@ -2035,7 +1784,6 @@
 0x054c	0x0023	"unknown"	"Sony Corp.|CD Writer"
 0x054c	0x0024	"unknown"	"Sony Corp.|Mavica CD-1000 Camera"
 0x054c	0x0025	"Removable:memory_card"	"Sony Corp.|NW-MS7 Walkman MemoryStick Reader"
-0x054c	0x002b	"usb-storage"	"Sony Corp.|Portable USB Harddrive V2"
 0x054c	0x002d	"Removable:memory_card"	"Sony Corp.|MSAC-US1 MemoryStick Reader"
 0x054c	0x002e	"Removable:memory_card"	"Sony Corp.|Sony HandyCam MemoryStick Reader"
 0x054c	0x0032	"Removable:memory_card"	"Sony Corp.|MemoryStick MSC-U01N Reader"
@@ -2044,7 +1792,6 @@
 0x054c	0x0058	"unknown"	"Sony Corp.|Clie PEG-N7x0C PalmOS PDA Mass Storage"
 0x054c	0x0066	"visor"	"Sony Corp.|Palm Handheld"
 0x054c	0x0069	"Removable:memory_card"	"Sony Corp.|Memorystick MSC-U03 Reader"
-0x054c	0x006d	"usb-storage"	"Sony Corp.|PEG Mass Storage"
 0x054c	0x008b	"unknown"	"Sony Corp.|Micro Vault 64M Mass Storage"
 0x054c	0x0095	"visor"	""
 0x054c	0x0099	"unknown"	"Sony Corp.|Clie NR70 PDA Mass Storage"
@@ -2207,38 +1954,7 @@
 0x057c	0x3000	"ISDN:fcdslusba,type=,firmware:fdlabase.frm"	"AVM GmbH|FtitzCard USB DSL SL USB Analog"
 0x057c	0x3500	"ISDN:fcdslslusb,type=,firmware:fdlubase.frm"	"AVM GmbH|FtitzCard USB DSL SL USB"
 0x057c	0x3800	"hci_usb"	""
-0x0582	0x0000	"snd-usb-audio"	""
-0x0582	0x0002	"snd-usb-audio"	"Roland Corp.|MPU64 Midi Interface"
-0x0582	0x0003	"snd-usb-audio"	"Roland Corp.|Sound Canvas SC-8850"
-0x0582	0x0004	"snd-usb-audio"	""
-0x0582	0x0005	"snd-usb-audio"	"Roland Corp.|Edirol UM-2 MIDI Adapter"
-0x0582	0x0007	"snd-usb-audio"	""
-0x0582	0x0008	"snd-usb-audio"	""
-0x0582	0x0009	"snd-usb-audio"	""
-0x0582	0x000b	"snd-usb-audio"	""
-0x0582	0x000c	"snd-usb-audio"	""
-0x0582	0x0010	"snd-usb-audio"	""
 0x0582	0x0011	"unknown"	"Roland Corp.|Edirol UA-5 Sound Capture "
-0x0582	0x0012	"snd-usb-audio"	""
-0x0582	0x0014	"snd-usb-audio"	""
-0x0582	0x0016	"snd-usb-audio"	""
-0x0582	0x001b	"snd-usb-audio"	""
-0x0582	0x001d	"snd-usb-audio"	""
-0x0582	0x0023	"snd-usb-audio"	""
-0x0582	0x0025	"snd-usb-audio"	""
-0x0582	0x0027	"snd-usb-audio"	""
-0x0582	0x0029	"snd-usb-audio"	""
-0x0582	0x002d	"snd-usb-audio"	"Roland Corp.|VX-2020 Synthesizer"
-0x0582	0x002f	"snd-usb-audio"	""
-0x0582	0x0033	"snd-usb-audio"	""
-0x0582	0x0037	"snd-usb-audio"	""
-0x0582	0x0040	"snd-usb-audio"	""
-0x0582	0x0044	"snd-usb-audio"	""
-0x0582	0x0048	"snd-usb-audio"	""
-0x0582	0x004d	"snd-usb-audio"	""
-0x0582	0x0050	"snd-usb-audio"	""
-0x0582	0x0052	"snd-usb-audio"	""
-0x0582	0x0065	"snd-usb-audio"	""
 0x0583	0x2030	"unknown"	"Padix (Rockfire) Co. Ltd.|RM-203 USB Nest [mode 1]"
 0x0583	0x2031	"unknown"	"Padix (Rockfire) Co. Ltd.|RM-203 USB Nest [mode 2]"
 0x0583	0x2032	"unknown"	"Padix (Rockfire) Co. Ltd.|RM-203 USB Nest [mode 3]"
@@ -2257,7 +1973,6 @@
 0x058f	0x9215	"unknown"	"Alcor Micro, Inc.|AU9814 Hub"
 0x058f	0x9254	"unknown"	"Alcor Micro, Inc.|Hub"
 0x058f	0x9330	"unknown"	"Alcor Micro Corp.|SD Reader"
-0x058f	0x9380	"usb-storage"	"Alcor Micro, Inc.|Mobile Hard Disk"
 0x058f	0x9382	"unknown"	"Alcor Micro Corp.|Acer Flash drive"
 0x058f	0x9410	"unknown"	"Alcor Micro, Inc.|MicroConnectors/StrongMan Keyboard"
 0x058f	0x9472	"unknown"	"Alcor Micro, Inc.|NEC Kbd Hub"
@@ -2274,22 +1989,17 @@
 0x059b	0x006d	"unknown"	"Iomega Corp.|HipZip MP3 Player"
 0x059b	0x1052	"unknown"	"Iomega Corp.|DVD+RW External Drive"
 0x059f	0x0212	"unknown"	"LaCie, Ltd|PocketDrive"
-0x059f	0xa601	"usb-storage"	"LaCie|HardDrive"
 0x05a4	0x9731	"unknown"	"Ortek Technology, Inc.|MCK-600W Keyboard"
 0x05a9	0x0511	"ov511"	"OmniVision Technologies, Inc.|OV511 WebCam"
 0x05a9	0x0518	"ov518_decomp"	"OmniVision Technologies, Inc.|OV518 WebCam"
 0x05a9	0xa511	"ov511"	"OmniVision Technologies, Inc.|OV511+ WebCam"
 0x05a9	0xa518	"ov511"	"OmniVision Technologies, Inc.|OV518 WebCam"
 0x05ab	0x0002	"unknown"	"In-System Design|Parallel Port"
-0x05ab	0x0031	"usb-storage"	"In-System Design|USB/IDE Bridge (ATA/ATAPI)"
 0x05ab	0x0060	"unknown"	"In-System Design|USB 2.0 Bridge"
 0x05ab	0x0200	"unknown"	"In-System Design|ATA Bridge"
 0x05ab	0x0202	"unknown"	"In-System Design|ATA Bridge"
-0x05ab	0x0301	"usb-storage"	"In-System Design|Portable USB Harddrive V2"
-0x05ab	0x0351	"usb-storage"	"In-System Design|Portable USB Harddrive V2"
 0x05ab	0x081a	"unknown"	"In-System Design|ATA Bridge"
 0x05ab	0x0cda	"unknown"	"In-System Design|ATA Bridge for CD-R/RW"
-0x05ab	0x5701	"usb-storage"	"In-System Design|USB Storage Adapter V2"
 0x05ac	0x0201	"unknown"	"Apple Computer|iMac Keyboard [ALPS M2452]"
 0x05ac	0x0202	"unknown"	"Apple Computer|Apple Keyboard [ALPS]"
 0x05ac	0x0205	"unknown"	"Apple Computer, Inc.|Apple Extended Keyboard [Mitsumi]"
@@ -2349,7 +2059,6 @@
 0x05da	0x40ca	"unknown"	"Microtek International Inc.|ScanMaker 3600"
 0x05da	0x80a3	"microtek"	"Microtek International Inc.|ScanMaker V6USL (#2)"
 0x05da	0x80ac	"microtek"	"Microtek International Inc.|ScanMaker V6UL/SpicyU"
-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	"at76_usb"	""
@@ -2364,7 +2073,6 @@
 0x05e3	0x0660	"unknown"	"Genesys Logic, Inc.|USB 2.0 Hub"
 0x05e3	0x0700	"Removable:memory_card"	"Genesys Logic, Inc.|CompactFlash Card Reader"
 0x05e3	0x0701	"unknown"	"Genesys Logic, Inc.|Optical Device"
-0x05e3	0x0702	"usb-storage"	"EagleTec|External Hard Disk"
 0x05e3	0x0703	"unknown"	"Genesys Logic, Inc.|Card Reader"
 0x05e3	0x0760	"unknown"	"Genesys Logic, Inc.|Card Reader"
 0x05e3	0x07a0	"unknown"	"Genesys Logic, Inc.|Pen Flash"
@@ -2496,7 +2204,6 @@
 0x068e	0x0504	"unknown"	"CH Products, Inc.|F-16 Combat Stick"
 0x0693	0x0002	"Removable:memory_card"	"Hagiwara Sys-Com|FlashGate SmartMedia Card Reader"
 0x0693	0x0003	"unknown"	"Hagiwara Sys-Com|FlasgGate CompactFlash Card Reader"
-0x0693	0x0005	"usb-storage"	"Hagiwara Sys-Com|FlashGate"
 0x0694	0x0001	"legousbtower"	"Lego Group|Mindstorms Tower"
 0x0698	0x1786	"unknown"	"Chuntex (CTX)|1300ex Monitor"
 0x0698	0x9999	"unknown"	"Chuntex (CTX)|VL710S Monitor+Hub"
@@ -2708,10 +2415,7 @@
 0x07aa	0x000d	"pegasus"	""
 0x07aa	0x0012	"prism2_usb"	"Corega K.K.|Stick-11 802.11b Adapter"
 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]"
-0x07af	0x0005	"usb-storage"	"Microtech|SCSI-HD50 SCSI Bridge [shuttle]"
 0x07af	0x0006	"Removable:camera"	"Microtech|CameraMate (DPCM_USB)"
 0x07b0	0x0001	"unknown"	"Trust Technologies|ISDN TA"
 0x07b0	0x0007	"ISDN:hfc_usb"	""
@@ -2761,11 +2465,8 @@
 0x07c0	0x1501	"unknown"	"Code Mercenaries Hard- und Software GmbH|IO-Warrior 24"
 0x07c0	0x1502	"unknown"	"Code Mercenaries Hard- und Software GmbH|IO-Warrior 48"
 0x07c0	0x1503	"unknown"	"Code Mercenaries Hard- und Software GmbH|IO-Warrior 28"
-0x07c4	0xa000	"usb-storage"	"Datafab Systems Inc.|Simple Technologies Flash Card Reader"
 0x07c4	0xa001	"Removable:memory_card"	"SIIG/Datafab|SIIG/Datafab Memory Stick+CompactFlash & SmartMedia Card Reader/Writer [eusb]"
 0x07c4	0xa002	"unknown"	"DataFab Systems, Inc.|Disk Drive"
-0x07c4	0xa003	"usb-storage"	"Datafab/Unknown|Datafab-based Reader"
-0x07c4	0xa004	"usb-storage"	"Datafab/Unknown|Datafab-based Reader"
 0x07c4	0xa005	"Removable:memory_card"	"PNY/Datafab|PNY/Datafab CompactFlash & SmartMedia Card Reader"
 0x07c4	0xa006	"Removable:memory_card"	"Simple Tech/Datafab|Simple Tech/Datafab CompactFlash  & SmartMedia Card Reader"
 0x07c4	0xa109	"Removable:memory_card"	"Datafab Systems, Inc.|USB to CompactFlash + SmartMedia Combo (LC1)"
@@ -2782,7 +2483,6 @@
 0x07cc	0x0200	"unknown"	"Carry Computer Eng., Co., Ltd.|6-in-1 Card Reader"
 0x07cc	0x0301	"unknown"	"Carry Computer Eng., Co., Ltd|6-in-1 Card Reader"
 0x07cd	0x0001	"unknown"	"Elektor|USBuart Serial Port"
-0x07cf	0x1001	"usb-storage"	"Casio Computer Co., Ltd.|QV-8000SX Digicam"
 0x07cf	0x2001	"ipaq"	""
 0x07cf	0x2002	"ipaq"	"Casio Computer Co., Ltd.|E-125 Cassiopeia Pocket PC"
 0x07cf	0x3801	"unknown"	"Casio Computer Co., Ltd.|Casio WMP-1 MP3-Watch"
@@ -2929,7 +2629,6 @@
 0x0960	0x0067	"ipaq"	""
 0x0961	0x0010	"ipaq"	""
 0x0967	0x0204	"prism2_usb"	"Acer|WarpLink 802.11b Adapter"
-0x097a	0x0001	"usb-storage"	"Minds@Work|Digital Wallet"
 0x0985	0x00a3	"unknown"	"cab Produkttechnik GmbH & Co KG|A3/200 or A3/300 Label Printer"
 0x0993	0x0001	"unknown"	"Gemstar eBook Group, Ltd.|REB1100 eBook Reader"
 0x099a	0x610c	"unknown"	"Zippy Technology Corp.|EL-610 Super Mini Electron luminescent Keyboard"
@@ -3027,7 +2726,6 @@
 0x0bda	0x8150	"rtl8150"	"Realtek Semiconductor Corp.|RTL8150 Fast Ethernet Adapter"
 0x0bda	0x8151	"unknown"	"RealTek Semiconductor Corp.|RTL8151 Adapteon Business Mobile Networks BV"
 0x0bdb	0x1002	"hci_usb"	"Ericsson Business Mobile Networks BV|"
-0x0bf6	0xa001	"usb-storage"	"Addonics Technologies, Inc.|USB Cable 205"
 0x0bf6	0xa002	"unknown"	"Addonics Technologies, Inc.|IDE Bridge"
 0x0bf8	0x1001	"ipaq"	"Fujitsu Siemens Computers|Fujitsu Pocket Loox 600 PDA"
 0x0c08	0x0378	"unknown"	"Agate|Q 16MB Storage Device"
@@ -3101,7 +2799,6 @@
 0x0c55	0x0510	"unknown"	"Spectrum Digital, Inc.|Spectrum Digital XDS510 JTAG Debugger"
 0x0c70	0x0000	"unknown"	"MCT Elektronikladen|USB08 Development board"
 0x0c74	0x0002	"unknown"	"Optronic Laboratories Inc.|OL 700-30 Goniometer"
-0x0c76	0x0003	"usb-storage"	"JMTek|USBDrive"
 0x0c76	0x0005	"Removable:memory_card"	"JMTek|USBdisk"
 0x0c76	0x0006	"unknown"	"JMTek, LLC.|Transcend JetFlash"
 0x0c88	0x0021	"visor"	""
@@ -4395,7 +4092,6 @@
 0x1061	0x0001	"unknown"	"I.I.T.|AGX016"
 0x1061	0x0002	"unknown"	"I.I.T.|IIT3204/3501"
 0x1063	0x1555	"unknown"	"Motorola|MC141555 Hub"
-0x1065	0x2136	"usb-storage"	"CCYU TECHNOLOGY|EasyDisk Portable Device"
 0x1066	0x0000	"unknown"	"PicoPower Technology|PT80C826"
 0x1066	0x0001	"unknown"	"PicoPower Technology|PT86C521 [Vesuvius v1] Host Bridge"
 0x1066	0x0002	"unknown"	"PicoPower Technology|PT86C523 [Vesuvius v3] PCI-ISA Bridge Master"
@@ -6859,11 +6555,8 @@
 0x15f4	0x0001	"unknown"	"HanfTek|HanfTek UMT-010 USB2.0 DVB-T (cold)"
 0x15f4	0x0025	"unknown"	"HanfTek|HanfTek UMT-010 USB2.0 DVB-T (warm)"
 0x1604	0x8000	"unknown"	"Tascam|US-428 Audio/Midi Controller (without fw)"
-0x1604	0x8001	"snd-usb-usx2y"	"Tascam|US-428 Audio/Midi Controller"
 0x1604	0x8004	"unknown"	"Tascam|US-224 Audio/Midi Controller (without fw)"
-0x1604	0x8005	"snd-usb-usx2y"	"Tascam|US-224 Audio/Midi Controller"
 0x1604	0x8006	"unknown"	"Tascam|US-122 Audio/Midi Interface (without fw)"
-0x1604	0x8007	"snd-usb-usx2y"	"Tascam|US-122 Audio/Midi Interface"
 0x1606	0x0002	"unknown"	"Umax|Astra 1236U"
 0x1606	0x0010	"scanner"	"Umax|Astra 1220U"
 0x1606	0x0030	"scanner"	"Umax|Astra 2000U"
@@ -7077,7 +6770,6 @@
 0x2375	0x0001	"unknown"	"Digit@lway, Inc.|Digital Audio Player"
 0x2478	0x2008	"pl2303"	""
 0x2632	0x3209	"unknown"	"TwinMOS|7-in-1 Card Reader"
-0x2735	0x4104	"usb-storage"	""
 0x2770	0x9120	"unknown"	"NHJ, Ltd|Che-ez! Snap / iClick Tiny VGA Digital Camera"
 0x2821	0x3300	"prism2_usb"	""
 0x2c02	0x14ea	"prism2_usb"	""