summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorTom Cosgrove <tom@cvs.openbsd.org>2004-01-08 20:26:01 +0000
committerTom Cosgrove <tom@cvs.openbsd.org>2004-01-08 20:26:01 +0000
commita421720e4e75eab68529f364f3c01f239e0fb23c (patch)
tree4684fde03215bc6421d23aae256ea397e0a6555e /sys/dev
parent16775a74a7ec3bf99ad7a9c1fb34869220bbdefd (diff)
Merge entries for Cirrus Logic CS4280 and CS4614 (same device id)
ok krw@, deraadt@
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/pci/pcidevs5
1 files changed, 2 insertions, 3 deletions
diff --git a/sys/dev/pci/pcidevs b/sys/dev/pci/pcidevs
index 6d6031e173e..3a09cc79829 100644
--- a/sys/dev/pci/pcidevs
+++ b/sys/dev/pci/pcidevs
@@ -1,4 +1,4 @@
-$OpenBSD: pcidevs,v 1.703 2004/01/07 00:06:07 tom Exp $
+$OpenBSD: pcidevs,v 1.704 2004/01/08 20:26:00 tom Exp $
/* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */
/*
@@ -776,9 +776,8 @@ 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 CS4614 0x6003 CS4614
product CIRRUS CS4615 0x6004 CS4615
-product CIRRUS CS4280 0x6003 CS4280 CrystalClear Audio
+product CIRRUS CS4280 0x6003 CS4280/46xx CrystalClear Audio
product CIRRUS CS4281 0x6005 CS4281 CrystalClear Audio
/* CMD Technology products -- info gleaned from www.cmd.com */