summaryrefslogtreecommitdiff
path: root/sys/arch/i386/conf/GENERIC
diff options
context:
space:
mode:
authorMichael Shalayeff <mickey@cvs.openbsd.org>2001-10-24 03:24:02 +0000
committerMichael Shalayeff <mickey@cvs.openbsd.org>2001-10-24 03:24:02 +0000
commit321ef7d0f9a752d2eb2dcf4bba272287dbbeed2f (patch)
treeada1f188fc47060d5ddae8ebf091e19b8e415e35 /sys/arch/i386/conf/GENERIC
parent531697a277cb3f86906355145e8cf8aecce46c11 (diff)
add emu at pci
Diffstat (limited to 'sys/arch/i386/conf/GENERIC')
-rw-r--r--sys/arch/i386/conf/GENERIC3
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index d045bcf8c5d..f262e8c3cb8 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.279 2001/10/08 19:30:40 deraadt Exp $
+# $OpenBSD: GENERIC,v 1.280 2001/10/24 03:24:01 mickey Exp $
# $NetBSD: GENERIC,v 1.48 1996/05/20 18:17:23 mrg Exp $
#
# GENERIC -- everything that's currently supported
@@ -384,6 +384,7 @@ fms* at pci? dev ? function ? # Forte Media FM801
auvia* at pci? dev ? function ? # VIA VT82C686A
maestro* at pci? dev ? function ? # ESS Maestro PCI
yds* at pci? dev ? function ? # Yamaha YMF Audio
+emu* at pci? dev ? function ? # SB Live!
sb0 at isa? port 0x220 irq 5 drq 1 # SoundBlaster
sb* at isapnp?
ess* at isapnp? # ESS Tech ES188[78], ES888