summaryrefslogtreecommitdiff
path: root/sys/arch/i386/conf/GENERIC
diff options
context:
space:
mode:
authorMatthew Dempsky <matthew@cvs.openbsd.org>2011-05-24 20:27:12 +0000
committerMatthew Dempsky <matthew@cvs.openbsd.org>2011-05-24 20:27:12 +0000
commit74ab674d435acdab3c4aa84f2cb2e4cd6b2d6f6b (patch)
tree64afc765c3480299856522cd5b0b04e415ecb4bd /sys/arch/i386/conf/GENERIC
parent84cded86709d8bc018a9101ce6a067d69b5aa936 (diff)
On OpenBSD, we've always attached scsibus(4) to umass(4), even for
ATAPI devices. atapiscsi(4) is only for handling ATAPI devices on an ATA bus, so umass(4) shouldn't care about it. ok krw@, dlg@; no objections from deraadt@
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 34b1d6d6702..d0ede0eaed8 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.714 2011/05/18 14:21:20 sthen Exp $
+# $OpenBSD: GENERIC,v 1.715 2011/05/24 20:27:11 matthew Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -253,7 +253,6 @@ midi* at umidi?
ulpt* at uhub? # USB Printers
umass* at uhub? # USB Mass Storage devices
scsibus* at umass?
-atapiscsi* at umass?
uhidev* at uhub? # Human Interface Devices
ums* at uhidev? # USB mouse
wsmouse* at ums? mux 0