summaryrefslogtreecommitdiff
path: root/sys/arch/amd64/conf
diff options
context:
space:
mode:
authorBrad Smith <brad@cvs.openbsd.org>2006-07-27 04:41:49 +0000
committerBrad Smith <brad@cvs.openbsd.org>2006-07-27 04:41:49 +0000
commitea38d861cae80b6be161a068a5d5dac6f743d30a (patch)
tree5cd55049e891e6ba2d0714f8dbb4b6f3ea7169d6 /sys/arch/amd64/conf
parent6277f6f67b6912f4f8234665ebbdc76374557bd3 (diff)
enable cmpci(4) and enable midi@opl
Diffstat (limited to 'sys/arch/amd64/conf')
-rw-r--r--sys/arch/amd64/conf/GENERIC9
1 files changed, 5 insertions, 4 deletions
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index e7376a9bbfa..8b528753e28 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.144 2006/06/26 06:31:31 brad Exp $
+# $OpenBSD: GENERIC,v 1.145 2006/07/27 04:41:48 brad Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -400,7 +400,7 @@ eap* at pci? # Ensoniq AudioPCI S5016
#eso* at pci? # ESS Solo-1 PCI AudioDrive
#sv* at pci? # S3 SonicVibes (S3 617)
#neo* at pci? # NeoMagic 256AV/ZX
-#cmpci* at pci? # C-Media CMI8338/8738
+cmpci* at pci? # C-Media CMI8338/8738
auich* at pci? flags 0x0000 # i82801 ICH AC'97 audio
auixp* at pci? # ATI IXP AC'97 Audio
#autri* at pci? flags 0x0000 # Trident 4D WAVE
@@ -418,10 +418,11 @@ mpu* at isa? port 0x330
# OPL[23] FM synthesizers
#opl* at eso?
opl* at yds?
+#opl* at cmpci?
# MIDI support
midi* at pcppi? # MIDI interface to the PC speaker
-#midi* at opl? # OPL FM synth
+midi* at opl? # OPL FM synth
#midi* at autri?
midi* at eap?
midi* at mpu?
@@ -433,7 +434,7 @@ audio* at eap?
#audio* at eso?
#audio* at sv?
#audio* at neo?
-#audio* at cmpci?
+audio* at cmpci?
audio* at clcs?
#audio* at clct?
audio* at auich?