- resync with alsa-driver-0.9rc3

- s/snd-card/snd
- snd-dt0197h is snd-dt019x now

1 files changed, 69 insertions, 68 deletions

diff --git a/lst/isatable b/lst/isatable
index e7a7a13f..d3454f15 100644
--- a/lst/isatable
+++ b/lst/isatable
@@ -6,7 +6,7 @@
 "@P@1001"	"unknown"	"Advance Logic|ALS-110 Sound chip"	"unknown"	""
 "@X@0001"	"unknown"	"Diamond Technologies|DT-0197H subdevice"
 "@X@1001"	"unknown"	"Advance Logic|ALS-110 OPL3"	"sound"	"IS_OPL3	"
-"@@@0001"	"snd-card-cmi8330"	"C-Media|CMI CMI8330 SoundPRO"	"sound"	""
+"@@@0001"	"snd-cmi8330"	"C-Media|CMI CMI8330 SoundPRO"	"sound"	""
 "@@@9519"	"ne"	"unknown|NE2000 plug&play ethernet card"	"ethernet"	"IS_OPL3"
 "0Z08047"	"unknown"	"Zoom|56K/V90"	"modem"	""
 "ABP0174"	"ignore"	"AdvanSys|ABP742 SCSI Controller"	"scsi"	""
@@ -44,21 +44,21 @@
 "ADP7770"	"ignore"	"Adaptec|AIC-777X EISA SCSI Host"	"scsi"	""
 "ADP7771"	"ignore"	"Adaptec|AIC-7770 (AHA-274X) EISA SCSI Host"	"scsi"	""
 "ADP7880"	"ignore"	"Adaptec|AIC-7880 SCSI Host"	"scsi"	""
-"ADS7150"	snd-card-ad1816a"	"Analog Devices|AD1815"	"sound"	""
+"ADS7150"	snd-ad1816a"	"Analog Devices|AD1815"	"sound"	""
 "ADS7180"	"ad1816"	"Terratec|Soundsystem BASE 1"	"sound"	"HAS_DMA16"
 "ADS7181"	"mpu401"	"Terratec|Soundsystem BASE 1/MIDI"	"sound"	"HAS_MPU401"
 "ADS7182"	"unknown"	"Terratec|Soundsystem BASE 1/Gameport"	"joystick"	"HAS_JOYSTICK"
-"ADV550A"	"snd-card-interwave-stb"	"InterWave|STB with TEA6330T"	"sound"	""
+"ADV550A"	"snd-interwave-stb"	"InterWave|STB with TEA6330T"	"sound"	""
 "ADV55AA"	"ignore"	"AMD|PCNET Family Ethernet/ISA+"	"ethernet"	""
-"ADV55FF"	"snd-card-interwave"	"Panasonic|PCA761AW Audio Card"
+"ADV55FF"	"snd-interwave"	"Panasonic|PCA761AW Audio Card"
 "AEI0218"	"unknown"	"Actiontec|PCMCIA Adapter"	"unknown"	""
 "ALI1489"	"unknown"	"ALI|EIDE Controller"	"ide"	""
 "ALS0001"	"sb"	"Advance Logic|ALS-001 - PRO16PNP"	"sound"	""
 "ALS0007"	"sb"	"Advance Logic|ALS-007"	"sound"	"HAS_DMA16"
 "ALS0100"	"sb"	"Advance Logic|ALS-100"	"sound"	"HAS_DMA16"
-"ALS0110"	"snd-card-als100"	"Advance Logic|ALS-110 - MF1000 - Digimate 3D Sound"	"sound"	""
+"ALS0110"	"snd-als100"	"Advance Logic|ALS-110 - MF1000 - Digimate 3D Sound"	"sound"	""
 "ALS0120"	"sb"	"Advance Logic|ALS-120"	"sound"	"HAS_DMA16"
-"ALS0200"	"snd-card-als100"	"Advance Logic|ALS-200"	"sound"	""
+"ALS0200"	"snd-als100"	"Advance Logic|ALS-200"	"sound"	""
 "AMI15D1"	"unknown"	"AMI|Series-15 Host/A BIOS 1.10"	"unknown"	""
 "AMI15E1"	"unknown"	"AMI|Series-15 Host/A BIOS 1.20+"	"unknown"	""
 "AMI16B1"	"unknown"	"AMI|Enterprise II"	"unknown"	""
@@ -132,18 +132,18 @@
 "AXE2201"	"ne"	"Xerox Corporation|SN2000"	"ethernet"	""
 "AZT0500"	"unknown"	"Aztech|AZT3000 IDE CDROM"	"ide"	""
 "AZT1003"	"sb"	"Aztech|AZT3000"	"sound"	"Audio	HAS_DMA16"
-"AZT1022"	"snd-card-ad1816a"	"Analog|AD1816A - Aztech/Newcom SC-16 3D"	"sound"	""
-"AZT1008"	"snd-card-azt2320"	"Aztech|PRO16V [AZT2320]"
+"AZT1022"	"snd-ad1816a"	"Analog|AD1816A - Aztech/Newcom SC-16 3D"	"sound"	""
+"AZT1008"	"snd-azt2320"	"Aztech|PRO16V [AZT2320]"
 "AZT1605"	"sb"	"Aztech|Sound Galaxy Nova 16"	"sound"	""
 "AZT1608"	"sb"	"Aztech|Sound Galaxy Pro 16"	"sound"	""
 "AZT2001"	"unknown"	"Aztech|AZT3000"	"sound"	"MPU401	IS_MPU401"
 "AZT2316"	"sb"	"Aztech|Sound Galaxy Washington 16"	"sound"	"HAS_DMA16"
 "AZT2320"	"sb"	"Aztech|Sound Galaxy 16"	"sound"	"HAS_DMA16"
-"AZT3000"	"snd-card-azt2320"	"Aztech|AZT300: Packard Bell Sound III 336 AM/SP"	"sound"	""
+"AZT3000"	"snd-azt2320"	"Aztech|AZT300: Packard Bell Sound III 336 AM/SP"	"sound"	""
 "AZT3001"	"unknown"	"Aztech|AZT3000 Game Port"	"joystick"	""
-"AZT3002"	"snd-card-azt2320"	"Aztech|AT3300"	"sound"	""
-"AZT3005"	"snd-card-azt2320"	"Aztech|???"	"sound"	""
-"AZT3011"	"snd-card-azt2320"	"Aztech|???"	"sound"	""
+"AZT3002"	"snd-azt2320"	"Aztech|AT3300"	"sound"	""
+"AZT3005"	"snd-azt2320"	"Aztech|???"	"sound"	""
+"AZT3011"	"snd-azt2320"	"Aztech|???"	"sound"	""
 "AZT4001"	"unknown"	"Aztech|AZT3000 Modem"	"modem"	""
 "AZT5001"	"unknown"	"Aztech|AZT3000 EEPROM"	"unknown"	""
 "BRI0200"	"unknown"	"Boca|Complete Office Communicator (audio)"	"unknown"	""
@@ -152,8 +152,8 @@
 "BTU3840"	"ne"	"Boca Research|Lancard 2000 plus combo"	"ethernet"	""
 "BUS0042"	"unknown"	"BusLogic|MultiMaster SCSI Host"	"unknown"	""
 "BUS4201"	"unknown"	"BusLogic|MultiMaster EISA SCSI Host"	"unknown"	""
-"CDC1111"	"snd-card-interwave"	"Gravis|Dynasonic Pro"	"sound"	""
-"CMI0001"	"snd-card-cmi8330"	"C-Media|CMI CMI8330 SoundPRO"	"sound"	""
+"CDC1111"	"snd-interwave"	"Gravis|Dynasonic Pro"	"sound"	""
+"CMI0001"	"snd-cmi8330"	"C-Media|CMI CMI8330 SoundPRO"	"sound"	""
 "CON0071"	"unknown"	"CONTEC|C-NET(AT)P Adapter"	"unknown"	""
 "CON0072"	"unknown"	"CONTEC|C-NET(AT)P Adapter"	"unknown"	""
 "CPL05F4"	"unknown"	"Compal|562DU"	"unknown"	""
@@ -310,40 +310,41 @@
 "CSC000f"	"unknown"	"Crystal|Game Port"	"joystick"	""
 "CSC0010"	"unknown"	"Crystal|PnP Audio System Control Registers"	"sound"	""
 "CSC0100"	"ad1848"	"Crystal|CSC4232"	"sound"	"HAS_DMA16|HAS_MPU401|HAS_JOYSTICK"
-"CSC0225"	"snd-card-cs4236"	"Intel|Marlin Spike Motherboard - CS4235"	"sound"	""
-"CSC0437"	"snd-card-cs4236"	"Genius|Sound Maker 3DJ - CS4237B"	"sound"	""
-"CSC0735"	"snd-card-cs4236"	"Digital|PC 5000 Onboard - CS4236B"	"sound"	""
-"CSC0B35"	"snd-card-cs4236"	"Unknown|CS4236B"	"sound"	""
-"CSC0D32"	"snd-card-cs4232"	"Philips|PCA70PS"	"sound"	""
-"CSC1335"	"snd-card-cs4236"	"Gateway|E1000 Onboard CS4236B"	"sound"	""
-"CSC1425"	"snd-card-cs4236"	"Unknown|CS4235 on mainboard without MPU"	"sound"	""
-"CSC1525"	"snd-card-cs4236"	"HP|6330 Onboard sound"	"sound"	""
-"CSC1A32"	"snd-card-cs4232"	"TerraTec|Maestro 32/96 (CS4232)"	"sound"	""
-"CSC1E37"	"snd-card-cs4236"	"Crystal|TidalWave128"	"sound"	""
-"CSC4232"	"snd-card-cs4232"	"HP|Omnibook 5500 onboard"	"sound"	""
-"CSC4236"	"snd-card-cs4236"	"Crystal|MagicSound 16bit PnP"	"sound"	""
-"CSC4336"	"snd-card-cs4236"	"Crystal|3D - CS4237B"	"sound"	""
-"CSC4536"	"snd-card-cs4236"	"Typhoon|Soundsystem PnP - CS4236B"	"sound"	""
-"CSC4637"	"snd-card-cs4236"	"Crystal|CS4237B"	"sound"	""
-"CSC4837"	"snd-card-cs4236"	"NewClear|3D - CX4237B-XQ3"	"sound"	""
-"CSC6835"	"snd-card-cs4236"	"Dell|Optiplex GX1 - CS4236B"	"sound"	""
-"CSC6836"	"snd-card-cs4236"	"Dell|Workstation 400 Onboard - CS4236B"	"sound"	""
+"CSC0225"	"snd-cs4236"	"Intel|Marlin Spike Motherboard - CS4235"	"sound"	""
+"CSC0437"	"snd-cs4236"	"Genius|Sound Maker 3DJ - CS4237B"	"sound"	""
+"CSC0735"	"snd-cs4236"	"Digital|PC 5000 Onboard - CS4236B"	"sound"	""
+"CSC0B35"	"snd-cs4236"	"Unknown|CS4236B"	"sound"	""
+"CSC0D32"	"snd-cs4232"	"Philips|PCA70PS"	"sound"	""
+"CSC1335"	"snd-cs4236"	"Gateway|E1000 Onboard CS4236B"	"sound"	""
+"CSC1425"	"snd-cs4236"	"Unknown|CS4235 on mainboard without MPU"	"sound"	""
+"CSC1525"	"snd-cs4236"	"HP|6330 Onboard sound"	"sound"	""
+"CSC1A32"	"snd-cs4232"	"TerraTec|Maestro 32/96 (CS4232)"	"sound"	""
+"CSC1E37"	"snd-cs4236"	"Crystal|TidalWave128"	"sound"	""
+"CSC4232"	"snd-cs4232"	"HP|Omnibook 5500 onboard"	"sound"	""
+"CSC4236"	"snd-cs4236"	"Crystal|MagicSound 16bit PnP"	"sound"	""
+"CSC4336"	"snd-cs4236"	"Crystal|3D - CS4237B"	"sound"	""
+"CSC4536"	"snd-cs4236"	"Typhoon|Soundsystem PnP - CS4236B"	"sound"	""
+"CSC4625"	"snd-cs4236"	"Crystal|CX4235-XQ3 EP"	"sound"	""
+"CSC4637"	"snd-cs4236"	"Crystal|CS4237B"	"sound"	""
+"CSC4837"	"snd-cs4236"	"NewClear|3D - CX4237B-XQ3"	"sound"	""
+"CSC6835"	"snd-cs4236"	"Dell|Optiplex GX1 - CS4236B"	"sound"	""
+"CSC6836"	"snd-cs4236"	"Dell|Workstation 400 Onboard - CS4236B"	"sound"	""
 "CSC7532"	"wavefront"	"Turtle Beach|Wavefront Tropez (?TBS-2000?)"	"sound"	""
-"CSC7537"	"snd-card-cs4236"	"Turtle Beach|Malibu - CS4237B"	"sound"	""
+"CSC7537"	"snd-cs4236"	"Turtle Beach|Malibu - CS4237B"	"sound"	""
 "CSC7632"	"wavefront"	"Turtle Beach|Wavefront Tropez+"	"sound"	""
-"CSC8025"	"snd-card-cs4236"	"Unknown|CS4235 - onboard"	"sound"	""
-"CSC8037"	"snd-card-cs4236"	"IBM|Aptiva 2137 E24 Onboard - CS4237B"	"sound"	""
-"CSC9836"	"snd-card-cs4236"	"Guillemot|MaxiSound 16 PnP - CS4236B"	"sound"	""
-"CSC9837"	"snd-card-cs4236"	"Gallant|SC-70P"	"sound"	""
-"CSCA800"	"snd-card-cs4236"	"TerraTec|AudioSystem EWS64XL - CS4236B"	"sound"	""
-"CSCC835"	"snd-card-cs4236"	"IBM|IntelliStation M Pro motherboard"	"sound"	""
-"CSCD925"	"snd-card-cs4236"	"ACER|AW37/Pro - CS4235"	"sound"	""
-"CSCD937"	"snd-card-cs4236"	"ACER|AW35/Pro - CS4237B"	"sound"	""
-"CSCE825"	"snd-card-cs4236"	"Unknown|CS4235 without MPU401"	"sound"	""
-"CSCE836"	"snd-card-cs4236"	"IBM|PC 300PL Onboard - CS4236B"	"sound"	""
-"CSCF032"	"snd-card-cs4232"	"SIC|CrystalWave 32 (CS4232)"	"sound"	""
-"CSCF235"	"snd-card-cs4236"	"Unknown|CS4236B"	"sound"	""
-"CSCF238"	"snd-card-cs4236"	"Unknown|CS4236B"	"sound"	""
+"CSC8025"	"snd-cs4236"	"Unknown|CS4235 - onboard"	"sound"	""
+"CSC8037"	"snd-cs4236"	"IBM|Aptiva 2137 E24 Onboard - CS4237B"	"sound"	""
+"CSC9836"	"snd-cs4236"	"Guillemot|MaxiSound 16 PnP - CS4236B"	"sound"	""
+"CSC9837"	"snd-cs4236"	"Gallant|SC-70P"	"sound"	""
+"CSCA800"	"snd-cs4236"	"TerraTec|AudioSystem EWS64XL - CS4236B"	"sound"	""
+"CSCC835"	"snd-cs4236"	"IBM|IntelliStation M Pro motherboard"	"sound"	""
+"CSCD925"	"snd-cs4236"	"ACER|AW37/Pro - CS4235"	"sound"	""
+"CSCD937"	"snd-cs4236"	"ACER|AW35/Pro - CS4237B"	"sound"	""
+"CSCE825"	"snd-cs4236"	"Unknown|CS4235 without MPU401"	"sound"	""
+"CSCE836"	"snd-cs4236"	"IBM|PC 300PL Onboard - CS4236B"	"sound"	""
+"CSCF032"	"snd-cs4232"	"SIC|CrystalWave 32 (CS4232)"	"sound"	""
+"CSCF235"	"snd-cs4236"	"Unknown|CS4236B"	"sound"	""
+"CSCF238"	"snd-cs4236"	"Unknown|CS4236B"	"sound"	""
 "CSCFFFF"	"unknown"	"Crystal|PnP Audio System CODEC"	"unknown"	""
 "CSI0600"	"unknown"	"Cabletron|Systems CSI F70xx EISA FDDI Adapter Card"	"unknown"	""
 "CSI0690"	"unknown"	"Cabletron|Systems CSI F70X9 EISA FDDI DNI Adapter Card"	"unknown"	""
@@ -364,7 +365,7 @@
 "CTL002B"	"sb"	"Creative Labs|SB16 PnP"	"sound"	"HAS_OPL3|HAS_MPU401|HAS_DMA16"
 "CTL002C"	"sb"	"Creative Labs|SB16 PnP"	"sound"	"HAS_OPL3|HAS_MPU401|HAS_DMA16"
 "CTL0031"	"sb"	"Creative Labs|SB32 PnP Audio Device"	"sound"	"HAS_DMA16|HAS_AWE|HAS_OPL3|HAS_JOYSTICK"
-"CTL0035"	"snd-card-sb16"	"Creative Labs|Sound Blaster AWE 32 PnP"	"sound"	""
+"CTL0035"	"snd-sb16"	"Creative Labs|Sound Blaster AWE 32 PnP"	"sound"	""
 "CTL0039"	"sb"	"Creative Labs|SB AWE32"	"sound"	"HAS_DMA16|HAS_OPL3|HAS_AWE|HAS_JOYSTICK"
 "CTL0041"	"sb"	"Creative Labs|Audio Device (V16CL/V32D/V32G)"	"sound"	"HAS_DMA16|HAS_JOYSTICK"
 "CTL0042"	"sb"	"Creative Labs|SB AWE64 16-bit Audio"	"sound"	"HAS_DMA16|HAS_OPL3|HAS_AWE|HAS_JOYSTICK"
@@ -379,7 +380,7 @@
 "CTL0070"	"sb"	"Creative Labs|Vibra16C"	"sound"	""
 "CTL0080"	"sb"	"Creative Labs|Vibra16CL"	"sound"	"HAS_OPL3|HAS_MPU401|HAS_DMA16"
 "CTL0086"	"sb"	"Creative Labs|SB16"	"sound"	"HAS_OPL3|HAS_MPU401|HAS_DMA16"
-"CTL009A"	"snd-card-sb16"	"Creative Labs|SB AWE32 PnP"	"sound"	""
+"CTL009A"	"snd-sb16"	"Creative Labs|SB AWE32 PnP"	"sound"	""
 "CTL009C"	"sb"	"Creative Labs|SB AWE32 PnP"	"sound"	""
 "CTL009D"	"sb"	"Creative Labs|SB AWE64 PnP"	"sound"	""
 "CTL009E"	"sb"	"Creative Labs|SB AWE64 PnP Gold"	"sound"	""
@@ -466,7 +467,7 @@
 "DXP0013"	"unknown"	"DataExpert|InterWave FM/SB Emulation"	"unknown"	""
 "DXP0014"	"unknown"	"DataExpert|InterWave MPU-401 Emulation"	"sound"	"IS_MP401"
 "DXP0015"	"unknown"	"DataExpert|InterWave 3D Stereo Enhancer"	"unknown"	""
-"DXP3201"	"snd-card-interwave"	"DataExpert|MED3201 Audio Card"	"unknown"	""
+"DXP3201"	"snd-interwave"	"DataExpert|MED3201 Audio Card"	"unknown"	""
 "ECS0001"	"unknown"	"ECS|Vertos 1401"	"unknown"	""
 "ECS0002"	"unknown"	"ECS|Vertos 1501"	"unknown"	""
 "ECS0003"	"unknown"	"ECS|Vertos 1502"	"unknown"	""
@@ -517,7 +518,7 @@
 "ESS0000"	"unknown"	"ESS|ES1868 Control Interface"	"unknown"	""
 "ESS0001"	"unknown"	"ESS|ESS1869 Control Interface"	"unknown"	""
 "ESS0002"	"unknown"	"ESS|ESS1869 Control Interface"	"unknown"	""
-"ESS0003"	""snd-card-es18xx"	"ESS|ES1869 Plug and Play AudioDrive"	"sound"	""
+"ESS0003"	""snd-es18xx"	"ESS|ES1869 Plug and Play AudioDrive"	"sound"	""
 "ESS0004"	"unknown"	"ESS|ES1878 Control Interface"	"unknown"	""
 "ESS0006"	"sb"	"ESS|ESS1869"	"sound"	"PnP AudioDrive	HAS_DMA16"
 "ESS0100"	"sb"	"ESS|ES688 PnP AudioDrive"	"sound"	""
@@ -525,7 +526,7 @@
 "ESS0104"	"sb"	"ESS|ES1788 PnP AudioDrive"	"sound"	""
 "ESS0106"	"sb"	"ESS|ES1888 PnP AudioDrive"	"sound"	""
 "ESS0108"	"sb"	"ESS|ES888 PnP AudioDrive"	"sound"	""
-"ESS0968"	"snd-card-es968"	"ESS|1688"	"sound"	""
+"ESS0968"	"snd-es968"	"ESS|1688"	"sound"	""
 "ESS1481"	"sb"	"ESS|ES1488 AudioDrive"	"sound"	""
 "ESS1668"	"sb"	"ESS|1668"	"sound"	""
 "ESS1669"	"sb"	"ESS|1669"	"sound"	""
@@ -534,9 +535,9 @@
 "ESS1681"	"sb"	"ESS|ES1688 AudioDrive"	"sound"	""
 "ESS1781"	"sb"	"ESS|ES1788 AudioDrive"	"sound"	""
 "ESS1868"	"sb"	"ESS|ES1868 PnP AudioDrive"	"sound"	"HAS_DMA16|HAS_OPL3"
-"ESS1869"	"snd-card-es18xx"	"ESS|ES1869"	"sound"	""
+"ESS1869"	"snd-es18xx"	"ESS|ES1869"	"sound"	""
 "ESS1878"	"sb"	"ESS|ES1878 PnP AudioDrive"	"sound"	""
-"ESS1879"	"snd-card-es18xx"	"ESS|ES1879"	"sound"	""
+"ESS1879"	"snd-es18xx"	"ESS|ES1879"	"sound"	""
 "ESS1881"	"sb"	"ESS|ES1888 AudioDrive"	"sound"	""
 "ESS4881"	"unknown"	"ESS|ES488 AudioDrive"	"sound"	""
 "ESS6880"	"sb"	"ESS|ES688 AudioDrive + game port"	"sound"	"HAS_JOYSTICK"
@@ -1005,7 +1006,7 @@
 "LGI8002"	"unknown"	"Mouse|Logitech"	"unknown"	""
 "LGI800D"	"unknown"	"Mouse|Logitech"	"unknown"	""
 "LNE2000"	"ne"	"Linksys|Ether16 LAN Card"	"ethernet"	""
-"LWC1061"	"snd-card-a1848a"	"Highscreen|Sound-Boostar 16 3D"	"sound"	""
+"LWC1061"	"snd-a1848a"	"Highscreen|Sound-Boostar 16 3D"	"sound"	""
 "MAG00E3"	"unknown"	"MAG|InnoVision DX17T"	"unknown"	""
 "MAG11A6"	"unknown"	"MAG|InnoVision DX1495"	"unknown"	""
 "MAG15F4"	"unknown"	"MAG|InnoVision DX1595"	"unknown"	""
@@ -1030,7 +1031,7 @@
 "MDG0002"	"unknown"	"Madge|Smart 16/4 EISA Ringnode"	"unknown"	""
 "MDG0004"	"unknown"	"Madge|Smart 16/4 EISA Ringnode Mk3"	"unknown"	""
 "MDG0101"	"unknown"	"Madge|Smart 16/4 ISA Client PnP Ringnode"	"unknown"	""
-"MDK1605"	"snd-card-ad1816a"	"Highscreen|Sound-Boostar 16 3D"	"sound"	""
+"MDK1605"	"snd-ad1816a"	"Highscreen|Sound-Boostar 16 3D"	"sound"	""
 "MDY1900"	"unknown"	"Microdyne|NE2500 Ethernet Adapter"	"unknown"	""
 "MDY1901"	"unknown"	"Microdyne|NE2500T Ethernet Adapter"	"unknown"	""
 "MEI1604"	"unknown"	"Panasonic|TX-D2151W-ES"	"unknown"	""
@@ -1147,7 +1148,7 @@
 "NIC1601"	"unknown"	"Tulip|NCC16/NCC16HUB"	"unknown"	""
 "NIC1602"	"unknown"	"Tulip|NCC16/NCC16HUB"	"unknown"	""
 "NMX0010"	"unknown"	"NeoMagic|MagicGraph 128 VL"	"unknown"	""
-"NMX2200"	"snd-card-opl3sa2"	"NeoMagic|MagicWave 3DX"	"sound"	""
+"NMX2200"	"snd-opl3sa2"	"NeoMagic|MagicWave 3DX"	"sound"	""
 "NOK0085"	"unknown"	"NOKIA|449E"	"unknown"	""
 "NOK008D"	"unknown"	"NOKIA|449M"	"unknown"	""
 "NOK0093"	"unknown"	"NOKIA|44BS"	"unknown"	""
@@ -1193,12 +1194,12 @@
 "OPT0005"	"unknown"	"OPTi|SoundExpression SRS Sound Controller"	"unknown"	""
 "OPT0006"	"unknown"	"OPTi|PNP COM Port"	"unknown"	""
 "OPT0007"	"unknown"	"OPTi|PNP IDE Controller"	"ide"	""
-"OPT0924"	"snd-card-opti92x-ad1848"	"OPTi|82C924"	"sound"	""
-"OPT0925"	"snd-card-opti92x-ad1848"	"OPTi|82C925"	"sound"	""
-"OPT0928"	"snd-card-opti92x-ad1848"	"OPTi|82C928"	"sound"	""
-"OPT0930"	"snd-card-opti92x-ad1848"	"OPTi|86C930"	"sound"	"HAS_DMA16|HAS_MPU401"
+"OPT0924"	"snd-opti92x-ad1848"	"OPTi|82C924"	"sound"	""
+"OPT0925"	"snd-opti92x-ad1848"	"OPTi|82C925"	"sound"	""
+"OPT0928"	"snd-opti92x-ad1848"	"OPTi|82C928"	"sound"	""
+"OPT0930"	"snd-opti92x-ad1848"	"OPTi|86C930"	"sound"	"HAS_DMA16|HAS_MPU401"
 "OPT0931"	"mad16"	"OPTi|86C931 Audio Card"	"sound"	"HAS_DMA16|HAS_MPU401"
-"OPT0933"	"snd-card-opti92x-ad1848"	"OPTi|86C933"	"sound"	"HAS_DMA16|HAS_MPU401"
+"OPT0933"	"snd-opti92x-ad1848"	"OPTi|86C933"	"sound"	"HAS_DMA16|HAS_MPU401"
 "OPT9300"	"mad16"	"OPTi|930 Sound/OPL3 Device"	"sound"	"HAS_DMA16|HAS_MPU401"
 "OPT9301"	"unknown"	"OPTi|930 MPU-401 Device"	"unknown"	""
 "OPT9310"	"mad16"	"OPTi|PNP Sound System"	"sound"	"HAS_DMA16|HAS_MPU401"
@@ -1635,10 +1636,10 @@
 "RSS0251"	"unknown"	"Rockwell|K56Flex Plug-and-Play"	"modem"	""
 "RSS0262"	"unknown"	"WiseCom|5614Jx3[G] V90+K56Flex Internal Modem"	"modem"	""
 "RTI1600"	"unknown"	"RT1600/E|SCSI Miniport Driver"	"unknown"	""
-"RTL3000"	"snd-card-als100"	"Advance Logic|RTL-3000"	"sound"	""
+"RTL3000"	"snd-als100"	"Advance Logic|RTL-3000"	"sound"	""
 "RTL8019"	"ne"	"Realtek|RTL8019 Ethernet NIC"	"ethernet"	""
 "RTL8029"	"ne"	"Realtek|RTL8029 Ethernet NIC"	"ethernet"	""
-"RWB1688"	"snd-card-dt0197h"	"Diamond Technologies|DT-0197H (DT197A30)"	""sound"	""
+"RWB1688"	"snd-dt019x"	"Diamond Technologies|DT-0197H (DT197A30)"	""sound"	""
 "SAM0000"	"unknown"	"Samsung|SyncMaster 3Ne"	"unknown"	""
 "SAM0100"	"unknown"	"Samsung|SyncMaster 4S"	"unknown"	""
 "SAM1530"	"unknown"	"Samsung|SyncMaster 15GLsi"	"unknown"	""
@@ -1706,7 +1707,7 @@
 "SML6013"	"unknown"	"Smile|CA6013DS"	"unknown"	""
 "SML6719"	"unknown"	"Smile|CA6719"	"unknown"	""
 "SML8819"	"unknown"	"Smile|MM/CA6536DL/SL(NF)"	"unknown"	""
-"SMM7180"	"snd-card-ad1816a"	"Shark Predator ISA"	"sound"	""
+"SMM7180"	"snd-ad1816a"	"Shark Predator ISA"	"sound"	""
 "SNY0000"	"xunknown"	"Sony|CPD-15SF2/SX1/17SF2/17SE2T/20SF2"	"unknown"	""
 "SNY0050"	"unknown"	"Sony|CPD-100VS"	"unknown"	""
 "SNY00E0"	"unknown"	"Sony|GDM-W900"	"unknown"	""
@@ -1740,7 +1741,7 @@
 "SRC0836"	"unknown"	"ShamRock|SRC2102"	"unknown"	""
 "SSC0000"	"unknown"	"Sierra|14,4k SQ3228"	"modem"	""
 "SSC0001"	"unknown"	"Sierra|14,4k SQ3262"	"modem"	""
-"STB011A"	"snd-card-interwave"	"Gravis|UltraSound Plug & Play"
+"STB011A"	"snd-interwave"	"Gravis|UltraSound Plug & Play"
 "SUP0980"	"unknown"	"Diamon|SupraFAXModem V.32bis PnP"	"modem"	""
 "SUP1150"	"unknown"	"Diamond|SupraExpress 144 Plus PnP"	"modem"	""
 "SUP1200"	"unknown"	"Diamond|SupraFAXModem 288 PnP"	"modem"	""
@@ -1776,8 +1777,8 @@
 "TCM619C"	"unknown"	"3Com|3C619C Network Adapter"	"unknown"	""
 "TCM7700"	"unknown"	"3Com|3C770 FDDI Adapter"	"unknown"	""
 "TCO4145"	"unknown"	"Thomas-Conrad|Token Ring TC4145"	"unknown"	""
-"TER1411"	"snd-card-ad1816a"	"Analog Devices|AD1816A - Terratec Base 64"	"sound"	""
-"TER1112"	"snd-card-ad1816a"	"Analog Devices|AD1816A - Terratec AudioSystem EWS64S"	"sound"	""
+"TER1411"	"snd-ad1816a"	"Analog Devices|AD1816A - Terratec Base 64"	"sound"	""
+"TER1112"	"snd-ad1816a"	"Analog Devices|AD1816A - Terratec AudioSystem EWS64S"	"sound"	""
 "TER2211"	"unknown"	"Terratec|Soundsystem BASE 1/???"	"unknown"	""
 "TEX0011"	"unknown"	"Texas Instruments|33600/Fax"	"unknown"	""
 "TEX1100"	"unknown"	"Texas Instruments|V.34+ Internal PnP FAX"	"unknown"	""
@@ -1903,7 +1904,7 @@
 "YMH0023"	"unknown"	"Yamaha|OPL3-SAx COM Port"	"unknown"	""
 "YMH0024"	"unknown"	"Yamaha|OPL3-SAx IDE"	"ide"	""
 "YMH002F"	"unknown"	"Yamaha|OPL3-SAx (Reserved)"	"unknown"	""
-"YMH0030"	"snd-card-oplsa2"	"Yamaha OPL3-SA3 (integrated on Intel's Pentium II AL440LX motherboard)"	"sound"	""
+"YMH0030"	"snd-oplsa2"	"Yamaha OPL3-SA3 (integrated on Intel's Pentium II AL440LX motherboard)"	"sound"	""
 "YMH0800"	"opl3sa2"	"Yamaha|OPL3-SA2"	"sound"	"HAS_OPL3|HAS_DMA16|HAS_MPU401"
 "ZDS2000"	"unknown"	"Zenith|SCSI/IDE/Floppy EISA"	"unknown"	""
 "ZDS2010"	"unknown"	"Zenith|EISA IDE Controller"	"unknown"	""