summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
authorJonathan Gray <jsg@cvs.openbsd.org>2006-03-29 01:49:53 +0000
committerJonathan Gray <jsg@cvs.openbsd.org>2006-03-29 01:49:53 +0000
commit4afb44b794a181956e78e9820925f860ba6f06a5 (patch)
tree3717e8450f228c902f131e190973b11844fe2d85 /sys/arch
parent151af4edebe1f866ef6aa2f1dd93629863b0f2dc (diff)
Enable the MPU-401 MIDI UART found at isa address 0x330
on nforce systems. Tested with Monkey Island 2 and an MT-32.
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/amd64/conf/GENERIC4
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index cc02d6a5b57..a3203b55862 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.119 2006/03/24 10:39:07 jsg Exp $
+# $OpenBSD: GENERIC,v 1.120 2006/03/29 01:49:52 jsg Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -397,6 +397,7 @@ auvia* at pci? # VIA VT82C686A
#esa* at pci? # ESS Maestro3 PCI
yds* at pci? flags 0x0000 # Yamaha YMF Audio
emu* at pci? # SB Live!
+mpu* at isa? port 0x330
# OPL[23] FM synthesizers
#opl* at eso?
@@ -407,6 +408,7 @@ midi* at pcppi? # MIDI interface to the PC speaker
#midi* at opl? # OPL FM synth
#midi* at autri?
midi* at eap?
+midi* at mpu?
spkr0 at pcppi? # PC speaker