summaryrefslogtreecommitdiff
path: root/sys/arch/i386/conf/GENERIC
diff options
context:
space:
mode:
authorJacob Meuser <jakemsr@cvs.openbsd.org>2010-03-27 16:02:20 +0000
committerJacob Meuser <jakemsr@cvs.openbsd.org>2010-03-27 16:02:20 +0000
commit203ce21d20b19d07f089ed20ed0018ca01b44ace (patch)
tree761dba5f0c3df06881cdcffffde5d329d9ed47a9 /sys/arch/i386/conf/GENERIC
parent3e1df7c2e7754bee2fd16687cf56bb646b6faaba (diff)
aria(4) is an audio driver, but hasn't been compatible with audio(9)
for a long time (if ever?), so send it to the Attic. "with prejudice" miod@; GENERIC reminder from kettenis@
Diffstat (limited to 'sys/arch/i386/conf/GENERIC')
-rw-r--r--sys/arch/i386/conf/GENERIC3
1 files changed, 1 insertions, 2 deletions
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index b027e0c11ea..0d4092c0168 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.680 2010/03/03 20:57:28 mk Exp $
+# $OpenBSD: GENERIC,v 1.681 2010/03/27 16:02:19 jakemsr Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -737,7 +737,6 @@ gus0 at isa? port 0x220 irq 7 drq 1 drq2 6 # Gravis (drq2 is record drq)
ym* at isapnp?
mpu* at isapnp?
mpu* at isa? port 0x300 # generic MPU, Yamaha SW60XG
-#aria0 at isa? port 0x280 irq 10 drq 0 flags 0x1 # Prometheus Aria 16
# OPL[23] FM synthesizers
#opl0 at isa? port 0x388 # use only if not attached to sound card