summaryrefslogtreecommitdiffstats
path: root/sys/dev/usb/files.usb
diff options
context:
space:
mode:
authormatthew <matthew@openbsd.org>2011-05-24 20:27:11 +0000
committermatthew <matthew@openbsd.org>2011-05-24 20:27:11 +0000
commite6c4a397080f33ba6213c36608171d1a007974ca (patch)
tree94e97aee5aac1ea4d1a9b5e98d76f8af8ad5171d /sys/dev/usb/files.usb
parentFix nexthop calculation for directly connected P2P links. connected (diff)
downloadwireguard-openbsd-e6c4a397080f33ba6213c36608171d1a007974ca.tar.xz
wireguard-openbsd-e6c4a397080f33ba6213c36608171d1a007974ca.zip
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/dev/usb/files.usb')
-rw-r--r--sys/dev/usb/files.usb6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/usb/files.usb b/sys/dev/usb/files.usb
index 9fff2e9a8ab..394d18d19d8 100644
--- a/sys/dev/usb/files.usb
+++ b/sys/dev/usb/files.usb
@@ -1,4 +1,4 @@
-# $OpenBSD: files.usb,v 1.97 2011/01/06 19:32:09 damien Exp $
+# $OpenBSD: files.usb,v 1.98 2011/05/24 20:27:11 matthew Exp $
# $NetBSD: files.usb,v 1.16 2000/02/14 20:29:54 augustss Exp $
#
# Config file and device description for machine-independent USB code.
@@ -115,11 +115,11 @@ file dev/usb/ulpt.c ulpt needs-flag
# Mass storage
-device umass: scsi, atapi, ata
+device umass: scsi
attach umass at uhub
file dev/usb/umass.c umass
file dev/usb/umass_quirks.c umass
-file dev/usb/umass_scsi.c umass & (scsibus | atapiscsi)
+file dev/usb/umass_scsi.c umass & scsibus
# Misc