summaryrefslogtreecommitdiff
path: root/sys/arch/macppc/conf/GENERIC
diff options
context:
space:
mode:
authorBrad Smith <brad@cvs.openbsd.org>2005-12-23 03:56:49 +0000
committerBrad Smith <brad@cvs.openbsd.org>2005-12-23 03:56:49 +0000
commit3025d951cff0a7890e539105e4abeaeb54af4400 (patch)
tree6445262407da864f6e661592ed5e3eb182d84598 /sys/arch/macppc/conf/GENERIC
parent99a150e4e9774323e933d9a0c08fea7bed16b994 (diff)
add emu(4) and missing midi attachment for eap(4).
Diffstat (limited to 'sys/arch/macppc/conf/GENERIC')
-rw-r--r--sys/arch/macppc/conf/GENERIC8
1 files changed, 5 insertions, 3 deletions
diff --git a/sys/arch/macppc/conf/GENERIC b/sys/arch/macppc/conf/GENERIC
index 303a1d0f68b..ddfd1912d07 100644
--- a/sys/arch/macppc/conf/GENERIC
+++ b/sys/arch/macppc/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.117 2005/12/22 13:47:31 xsa Exp $g
+# $OpenBSD: GENERIC,v 1.118 2005/12/23 03:56:48 brad Exp $g
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -158,6 +158,7 @@ radio* at bktr?
# PCI audio devices
eap* at pci? # Ensoniq AudioPCI S5016
+emu* at pci? # SB Live!
#scsibus* at adv?
scsibus* at ahc?
@@ -221,7 +222,7 @@ umass* at uhub? # USB Mass Storage devices
scsibus* at umass?
atapiscsi* at umass?
uhidev* at uhub? # Human Interface Devices
-tpms* at uhidev? # Apple trackpad mouse
+tpms* at uhidev? # Apple touchpad mouse
wsmouse* at tpms? mux 0
ums* at uhidev? # USB mouse
wsmouse* at ums? mux 0
@@ -285,7 +286,7 @@ wdc* at pcmcia?
wsdisplay* at vgafb?
# MIDI support
-#midi* at eap?
+midi* at eap?
# Audio support
audio* at awacs?
@@ -293,6 +294,7 @@ audio* at snapper?
audio* at tumbler?
audio* at onyx?
audio* at eap?
+audio* at emu?
audio* at uaudio?
audio* at aoa?
audio* at daca?