diff options
author | Matthew Dempsky <matthew@cvs.openbsd.org> | 2011-05-24 20:27:12 +0000 |
---|---|---|
committer | Matthew Dempsky <matthew@cvs.openbsd.org> | 2011-05-24 20:27:12 +0000 |
commit | 74ab674d435acdab3c4aa84f2cb2e4cd6b2d6f6b (patch) | |
tree | 64afc765c3480299856522cd5b0b04e415ecb4bd /sys/arch/landisk | |
parent | 84cded86709d8bc018a9101ce6a067d69b5aa936 (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/landisk')
-rw-r--r-- | sys/arch/landisk/conf/GENERIC | 3 | ||||
-rw-r--r-- | sys/arch/landisk/conf/RAMDISK | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/sys/arch/landisk/conf/GENERIC b/sys/arch/landisk/conf/GENERIC index 31a5f225d6b..1b4fff0e667 100644 --- a/sys/arch/landisk/conf/GENERIC +++ b/sys/arch/landisk/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.33 2011/04/17 19:18:11 deraadt Exp $ +# $OpenBSD: GENERIC,v 1.34 2011/05/24 20:27:11 matthew Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -120,7 +120,6 @@ audio* at uaudio? 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 diff --git a/sys/arch/landisk/conf/RAMDISK b/sys/arch/landisk/conf/RAMDISK index 712ef07ee60..8420878cd19 100644 --- a/sys/arch/landisk/conf/RAMDISK +++ b/sys/arch/landisk/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.13 2010/07/03 01:48:18 matthew Exp $ +# $OpenBSD: RAMDISK,v 1.14 2011/05/24 20:27:11 matthew Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -93,7 +93,6 @@ uhub* at usb? uhub* at uhub? port ? configuration ? interface ? umass* at uhub? # USB Mass Storage devices scsibus* at umass? -atapiscsi* at umass? aue* at uhub? # ADMtek AN986 Pegasus Ethernet atu* at uhub? # Atmel AT76c50x based 802.11b axe* at uhub? # ASIX Electronics AX88172 USB Ethernet |