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/i386 | |
| 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/i386')
| -rw-r--r-- | sys/arch/i386/conf/GENERIC | 3 | ||||
| -rw-r--r-- | sys/arch/i386/conf/RAMDISKC | 3 | ||||
| -rw-r--r-- | sys/arch/i386/conf/RAMDISK_CD | 3 |
3 files changed, 3 insertions, 6 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 diff --git a/sys/arch/i386/conf/RAMDISKC b/sys/arch/i386/conf/RAMDISKC index fcfcc87e1cc..7fb060607f9 100644 --- a/sys/arch/i386/conf/RAMDISKC +++ b/sys/arch/i386/conf/RAMDISKC @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISKC,v 1.97 2011/01/07 19:33:08 deraadt Exp $ +# $OpenBSD: RAMDISKC,v 1.98 2011/05/24 20:27:11 matthew Exp $ machine i386 # architecture, used by config; REQUIRED @@ -108,7 +108,6 @@ uhub* at usb? # USB Hubs uhub* at uhub? # USB Hubs umass* at uhub? # USB Mass Storage devices scsibus* at umass? -atapiscsi* at umass? uhidev* at uhub? # Human Interface Devices ukbd* at uhidev? # USB keyboard wskbd* at ukbd? mux 1 diff --git a/sys/arch/i386/conf/RAMDISK_CD b/sys/arch/i386/conf/RAMDISK_CD index 311ff87c314..a0dc6d142f2 100644 --- a/sys/arch/i386/conf/RAMDISK_CD +++ b/sys/arch/i386/conf/RAMDISK_CD @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK_CD,v 1.186 2011/05/18 14:21:20 sthen Exp $ +# $OpenBSD: RAMDISK_CD,v 1.187 2011/05/24 20:27:11 matthew Exp $ machine i386 # architecture, used by config; REQUIRED @@ -124,7 +124,6 @@ ukbd* at uhidev? wskbd* at ukbd? mux 1 umass* at uhub? # USB Mass Storage devices scsibus* at umass? -atapiscsi* at umass? #ums* at uhidev? #wsmouse* at ums? mux 0 aue* at uhub? # ADMtek AN986 Pegasus Ethernet |