summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
authorMarc Espie <espie@cvs.openbsd.org>2001-01-11 23:38:58 +0000
committerMarc Espie <espie@cvs.openbsd.org>2001-01-11 23:38:58 +0000
commite9fa4df9658a85cb2e2afb051e470b26e45a41a0 (patch)
tree3be306039158047e708360acd722b1ecbeba668f /sys/arch
parent4acc60cf37f39c5adb19a802bcd83380a9874478 (diff)
Add maestro
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/i386/conf/GENERIC4
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index e4317292bcb..5c62ca13a4c 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.219 2001/01/11 19:45:47 mickey Exp $
+# $OpenBSD: GENERIC,v 1.220 2001/01/11 23:38:57 espie Exp $
# $NetBSD: GENERIC,v 1.48 1996/05/20 18:17:23 mrg Exp $
#
# GENERIC -- everything that's currently supported
@@ -346,6 +346,7 @@ auich* at pci? dev ? function ? # i82801 ICH AC'97 audio
clcs* at pci? dev ? function ? # CS4280 CrystalClear audio
fms* at pci? dev ? function ? # Forte Media FM801
auvia* at pci? dev ? function ? # VIA VT82C686A
+maestro* at pci? dev ? function ? # ESS Maestro PCI
sb0 at isa? port 0x220 irq 5 drq 1 # SoundBlaster
sb* at isapnp?
ess* at isapnp? # ESS Tech ES188[78], ES888
@@ -390,6 +391,7 @@ audio* at auich?
audio* at fms?
audio* at auvia?
audio* at uaudio?
+audio* at maestro?
bktr0 at pci? dev ? function ?