shorten

1 files changed, 19 insertions, 19 deletions

diff --git a/sys/dev/pci/pcidevs b/sys/dev/pci/pcidevs
index 8b5ebfdfac2..b4a3d1ac1ed 100644
--- a/sys/dev/pci/pcidevs
+++ b/sys/dev/pci/pcidevs
@@ -1,4 +1,4 @@
-$OpenBSD: pcidevs,v 1.898 2005/07/27 23:45:10 brad Exp $
+$OpenBSD: pcidevs,v 1.899 2005/07/30 22:43:10 deraadt Exp $
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ 	*/
 
 /*
@@ -668,7 +668,7 @@ product ATI RADEON_9600XT_2	0x4172	Radeon 9600 XT 2nd
 product ATI R200_BB		0x4242	Radeon 8500 BB
 product ATI RADEON_IGP320M	0x4336	Radeon IGP 320M
 product ATI MOBILITY_M6		0x4337	Mobility M6
-product ATI IXP_AUDIO_200	0x4341	IXP200 AC'97
+product ATI IXP_AUDIO_200	0x4341	IXP200 AC97
 product ATI SB200_PPB		0x4342	SB200 PCI-PCI
 product ATI SB200_EHCI		0x4345	SB200 USB2
 product ATI SB200_OHCI_1	0x4347	SB200 USB
@@ -677,8 +677,8 @@ product ATI SB200_ISA		0x434c	SB200 PCI-ISA
 product ATI SB200_SMB		0x4353	SB200 SMBus
 product ATI MACH64_CT		0x4354	Mach64 CT
 product ATI MACH64_CX		0x4358	Mach64 CX
-product ATI IXP_AUDIO_300	0x4361	IXP300 AC'97
-product ATI IXP_AUDIO_400	0x4370	IXP400 AC'97
+product ATI IXP_AUDIO_300	0x4361	IXP300 AC97
+product ATI IXP_AUDIO_400	0x4370	IXP400 AC97
 product ATI IXP_PCI_400		0x4371	IXP400 PCI
 product ATI IXP_SMBUS_400	0x4372	IXP400 SMBus
 product ATI IXP_EHCI_400	0x4373	IXP400 USB2
@@ -952,10 +952,10 @@ product CIRRUS CL_PD6833	0x1113	CL-PD6833 CardBus
 product CIRRUS CL_GD7542	0x1200	CL-GD7542
 product CIRRUS CL_GD7543	0x1202	CL-GD7543
 product CIRRUS CL_GD7541	0x1204	CL-GD7541
-product CIRRUS CS4610		0x6001	CS4610 SoundFusion Audio
+product CIRRUS CS4610		0x6001	CS4610 SoundFusion
 product CIRRUS CS4615		0x6004	CS4615
-product CIRRUS CS4280		0x6003	CS4280/46xx CrystalClear Audio
-product CIRRUS CS4281		0x6005	CS4281 CrystalClear Audio
+product CIRRUS CS4280		0x6003	CS4280/46xx CrystalClear
+product CIRRUS CS4281		0x6005	CS4281 CrystalClear
 
 /* CMD Technology products -- info gleaned from www.cmd.com */
 product CMDTECH 640		0x0640	PCI0640
@@ -1194,7 +1194,7 @@ product ENSONIQ AUDIOPCI	0x5000	AudioPCI
 product ENSONIQ CT5880		0x5880	CT5880
 
 /* ESS Technology products */
-product ESSTECH	ES336H		0x0000	ES366H Fax/Modem (early)
+product ESSTECH	ES336H		0x0000	ES366H Modem
 product ESSTECH	MAESTROII	0x1968	Maestro II
 product ESSTECH SOLO1		0x1969	SOLO-1 AudioDrive
 product ESSTECH MAESTRO2E	0x1978	Maestro 2E
@@ -2076,7 +2076,7 @@ product NVIDIA NFORCE4_SATA1	0x0054	nForce4 SATA 1
 product NVIDIA NFORCE4_SATA2	0x0055	nForce4 SATA 2
 product NVIDIA CK804_LAN1	0x0056	CK804 LAN
 product NVIDIA CK804_LAN2	0x0057	CK804 LAN
-product NVIDIA NFORCE4_AC	0x0059	nForce4 AC-97
+product NVIDIA NFORCE4_AC	0x0059	nForce4 AC97
 product NVIDIA NFORCE4_USB	0x005a	nForce4 USB
 product NVIDIA NFORCE4_USB2	0x005b	nForce4 USB
 product NVIDIA NFORCE4_PPB	0x005c	nForce4 PCI-PCI
@@ -2088,7 +2088,7 @@ product NVIDIA NFORCE2_IDE	0x0065	nForce2 IDE
 product NVIDIA NFORCE2_LAN	0x0066	nForce2 LAN
 product NVIDIA NFORCE2_USB	0x0067	nForce2 USB
 product NVIDIA NFORCE2_USB2	0x0068	nForce2 USB
-product NVIDIA NFORCE2_ACA	0x006a	nForce2	AC-97 Audio
+product NVIDIA NFORCE2_ACA	0x006a	nForce2	AC97
 product NVIDIA NFORCE2_APU	0x006b	nForce2	Audio
 product NVIDIA NFORCE2_PPB	0x006c	nForce2 PCI-PCI
 product NVIDIA NFORCE2_PPB2	0x006d	nForce2 PCI-PCI
@@ -2099,7 +2099,7 @@ product NVIDIA NFORCE2_400_IDE	0x0085	nForce2 400 IDE
 product NVIDIA NFORCE3_LAN2	0x0086	nForce3 LAN
 product NVIDIA NFORCE2_400_USB	0x0087	nForce2 400 USB
 product NVIDIA NFORCE2_400_USB2	0x0088	nForce2 400 USB2
-product NVIDIA NFORCE2_400_ACA	0x008a	nForce2 400 AC-97 Audio
+product NVIDIA NFORCE2_400_ACA	0x008a	nForce2 400 AC97
 product NVIDIA NFORCE2_400_PPB	0x008b	nForce2 400 PCI-PCI
 product NVIDIA NFORCE3_LAN3	0x008c	nForce3 LAN
 product NVIDIA NFORCE2_400_SATA	0x008e	nForce2 400 SATA
@@ -2112,7 +2112,7 @@ product NVIDIA NFORCE3_IDE	0x00d5	nForce3 IDE
 product NVIDIA NFORCE3_LAN1	0x00d6	nForce3 LAN
 product NVIDIA NFORCE3_USB	0x00d7	nForce3 USB
 product NVIDIA NFORCE3_USB2	0x00d8	nForce3 USB
-product NVIDIA NFORCE3_ACA	0x00da	nForce3 AC-97 Audio
+product NVIDIA NFORCE3_ACA	0x00da	nForce3 AC97
 product NVIDIA NFORCE3_PPB	0x00dd	nForce3 PCI-PCI
 product NVIDIA NFORCE3_LAN4	0x00df	nForce3 LAN
 product NVIDIA NFORCE3_250_ISA	0x00e0	nForce3 250 ISA
@@ -2124,7 +2124,7 @@ product NVIDIA NFORCE3_250_IDE	0x00e5	nForce3 250 IDE
 product NVIDIA NFORCE3_LAN5	0x00e6	nForce3 LAN
 product NVIDIA NFORCE3_250_USB	0x00e7	nForce3 250 USB
 product NVIDIA NFORCE3_250_USB2	0x00e8	nForce3 250 USB2
-product NVIDIA NFORCE3_250_ACA	0x00ea	nForce3 250 AC-97 Audio
+product NVIDIA NFORCE3_250_ACA	0x00ea	nForce3 250 AC97
 product NVIDIA NFORCE3_250_PPB	0x00ed	nForce3 250 PCI-PCI
 product NVIDIA GEFORCE6600GTAGP	0x00f1	GeForce 6600 GT AGP
 product NVIDIA QUADROFX330	0x00fd	Quadro FX 330
@@ -2152,9 +2152,9 @@ product NVIDIA GEFORCE4440GOM64	0x0179	GeForce4 440 Go 64M
 product NVIDIA QUADRO4200	0x017a	Quadro4 200/400NVS
 product NVIDIA QUADRO4550XGL	0x017b	Quadro4 550XGL
 product NVIDIA QUADRO4500GOGL	0x017c	Quadro4 GoGL
-product NVIDIA GEFORCE4MX440AGP8	0x0181	GeForce4 MX 440 AGP 8x
-product NVIDIA GEFORCE4MX440SEAGP8	0x0182	GeForce4 MX 440SE AGP 8x
-product NVIDIA GEFORCE4MX420AGP8	0x0183	GeForce 4 MX 420 AGP 8x
+product NVIDIA GEFORCE4MX440AGP8	0x0181	GeForce4 MX 440 AGP
+product NVIDIA GEFORCE4MX440SEAGP8	0x0182	GeForce4 MX 440SE AGP
+product NVIDIA GEFORCE4MX420AGP8	0x0183	GeForce 4 MX 420 AGP
 product NVIDIA GEFORCE4MX4000	0x0185	GeForce4 MX 4000
 product NVIDIA QUADRO4_580XGL	0x0188	Quadro4 580 XGL
 product NVIDIA QUADRO4NVS	0x018a	Quadro4 NVS
@@ -2166,7 +2166,7 @@ product NVIDIA NFORCE_DDR	0x01ab	nForce 420 DDR
 product NVIDIA NFORCE_MEM	0x01ac	nForce 220/420
 product NVIDIA NFORCE_MEM1	0x01ad	nForce 220/420
 product NVIDIA NFORCE_APU	0x01b0	nForce APU
-product NVIDIA NFORCE_ACA	0x01b1	nForce AC-97 Audio
+product NVIDIA NFORCE_ACA	0x01b1	nForce AC97
 product NVIDIA NFORCE_ISA	0x01b2	nForce ISA
 product NVIDIA NFORCE_SMB	0x01b4	nForce SMBus
 product NVIDIA NFORCE_AGP	0x01b7	nForce AGP
@@ -2182,7 +2182,7 @@ product NVIDIA NFORCE2_MEM2	0x01ec	nForce2
 product NVIDIA NFORCE2_MEM3	0x01ed	nForce2
 product NVIDIA NFORCE2_MEM4	0x01ee	nForce2
 product NVIDIA NFORCE2_MEM5	0x01ef	nForce2
-product NVIDIA GEFORCE4MXNFORCE	0x01f0	GeForce4 MX - nForce GPU
+product NVIDIA GEFORCE4MXNFORCE	0x01f0	GeForce4 MX nForce GPU
 product NVIDIA GEFORCE3		0x0200	GeForce3
 product NVIDIA GEFORCE3TI200	0x0201	GeForce3 Ti 200
 product NVIDIA GEFORCE3TI500	0x0202	GeForce3 Ti 500
@@ -2774,7 +2774,7 @@ product USR2 WL11000P		0x3685	WL11000P
 product V3 V961PBC		0x0002	V961PBC i960 PCI
 product V3 V292PBC		0x0292	V292PBC AMD290x0 PCI
 product V3 V960PBC		0x0960	V960PBC	i960 PCI
-product V3 V96DPC		0xc960	V96DPC i960 (Dual) PCI
+product V3 V96DPC		0xc960	V96DPC i960 PCI
 
 /* VIA Technologies products */
 product VIATECH	K8HTB_0		0x0282	K8HTB Host