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/sgi | |
| 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/sgi')
| -rw-r--r-- | sys/arch/sgi/conf/GENERIC-IP27 | 4 | ||||
| -rw-r--r-- | sys/arch/sgi/conf/GENERIC-IP30 | 4 | ||||
| -rw-r--r-- | sys/arch/sgi/conf/GENERIC-IP32 | 4 | ||||
| -rw-r--r-- | sys/arch/sgi/conf/RAMDISK-IP27 | 4 | ||||
| -rw-r--r-- | sys/arch/sgi/conf/RAMDISK-IP30 | 4 | ||||
| -rw-r--r-- | sys/arch/sgi/conf/RAMDISK-IP32 | 4 |
6 files changed, 6 insertions, 18 deletions
diff --git a/sys/arch/sgi/conf/GENERIC-IP27 b/sys/arch/sgi/conf/GENERIC-IP27 index 9df8c719f33..26c5258e5ca 100644 --- a/sys/arch/sgi/conf/GENERIC-IP27 +++ b/sys/arch/sgi/conf/GENERIC-IP27 @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC-IP27,v 1.40 2011/05/02 19:51:05 miod Exp $ +# $OpenBSD: GENERIC-IP27,v 1.41 2011/05/24 20:27:11 matthew Exp $ # # THIS KERNEL IS FOR Origin, Onyx, Fuel, Tezro (IP27, IP35) SYSTEMS ONLY. # @@ -117,8 +117,6 @@ uaudio* at uhub? # USB Audio audio* at uaudio? ulpt* at uhub? # USB Printers umass* at uhub? # USB Mass Storage devices -atapiscsi* at umass? -scsibus* at atapiscsi? scsibus* at umass? urio* at uhub? # Diamond Multimedia Rio 500 uscanner* at uhub? disable# USB Scanners diff --git a/sys/arch/sgi/conf/GENERIC-IP30 b/sys/arch/sgi/conf/GENERIC-IP30 index 072c341fba8..722c6755eac 100644 --- a/sys/arch/sgi/conf/GENERIC-IP30 +++ b/sys/arch/sgi/conf/GENERIC-IP30 @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC-IP30,v 1.34 2011/05/02 19:51:05 miod Exp $ +# $OpenBSD: GENERIC-IP30,v 1.35 2011/05/24 20:27:11 matthew Exp $ # # THIS KERNEL IS FOR Octane and Octane 2 (IP30) SYSTEMS ONLY. # @@ -109,8 +109,6 @@ uaudio* at uhub? # USB Audio audio* at uaudio? ulpt* at uhub? # USB Printers umass* at uhub? # USB Mass Storage devices -atapiscsi* at umass? -scsibus* at atapiscsi? scsibus* at umass? urio* at uhub? # Diamond Multimedia Rio 500 uscanner* at uhub? disable# USB Scanners diff --git a/sys/arch/sgi/conf/GENERIC-IP32 b/sys/arch/sgi/conf/GENERIC-IP32 index 105082060e5..31163d6e61d 100644 --- a/sys/arch/sgi/conf/GENERIC-IP32 +++ b/sys/arch/sgi/conf/GENERIC-IP32 @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC-IP32,v 1.25 2011/05/02 19:51:05 miod Exp $ +# $OpenBSD: GENERIC-IP32,v 1.26 2011/05/24 20:27:11 matthew Exp $ # # THIS KERNEL IS FOR O2 (IP32) SYSTEMS ONLY. # @@ -101,8 +101,6 @@ uaudio* at uhub? # USB Audio audio* at uaudio? ulpt* at uhub? # USB Printers umass* at uhub? # USB Mass Storage devices -atapiscsi* at umass? -scsibus* at atapiscsi? scsibus* at umass? urio* at uhub? # Diamond Multimedia Rio 500 uscanner* at uhub? disable# USB Scanners diff --git a/sys/arch/sgi/conf/RAMDISK-IP27 b/sys/arch/sgi/conf/RAMDISK-IP27 index e6ef8fe73cd..46ca2425e3e 100644 --- a/sys/arch/sgi/conf/RAMDISK-IP27 +++ b/sys/arch/sgi/conf/RAMDISK-IP27 @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK-IP27,v 1.24 2011/05/02 19:51:05 miod Exp $ +# $OpenBSD: RAMDISK-IP27,v 1.25 2011/05/24 20:27:11 matthew Exp $ # # THIS KERNEL IS FOR Origin, Onyx, Fuel, Tezro (IP27, IP35) SYSTEMS ONLY. @@ -109,8 +109,6 @@ ubsa* at uhub? # Belkin serial adapter ucom* at ubsa? #ulpt* at uhub? # USB Printers umass* at uhub? # USB Mass Storage devices -atapiscsi* at umass? -scsibus* at atapiscsi? scsibus* at umass? uhidev* at uhub? # Human Interface Devices ums* at uhidev? # USB mouse diff --git a/sys/arch/sgi/conf/RAMDISK-IP30 b/sys/arch/sgi/conf/RAMDISK-IP30 index 28ccfeb879c..0b75b55436b 100644 --- a/sys/arch/sgi/conf/RAMDISK-IP30 +++ b/sys/arch/sgi/conf/RAMDISK-IP30 @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK-IP30,v 1.20 2011/05/02 19:51:05 miod Exp $ +# $OpenBSD: RAMDISK-IP30,v 1.21 2011/05/24 20:27:11 matthew Exp $ # # THIS KERNEL IS FOR Octane and Octane 2 (IP30) SYSTEMS ONLY. @@ -102,8 +102,6 @@ ubsa* at uhub? # Belkin serial adapter ucom* at ubsa? #ulpt* at uhub? # USB Printers umass* at uhub? # USB Mass Storage devices -atapiscsi* at umass? -scsibus* at atapiscsi? scsibus* at umass? uhidev* at uhub? # Human Interface Devices ums* at uhidev? # USB mouse diff --git a/sys/arch/sgi/conf/RAMDISK-IP32 b/sys/arch/sgi/conf/RAMDISK-IP32 index 4ed300a96e2..45c4386f143 100644 --- a/sys/arch/sgi/conf/RAMDISK-IP32 +++ b/sys/arch/sgi/conf/RAMDISK-IP32 @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK-IP32,v 1.16 2011/05/02 19:51:05 miod Exp $ +# $OpenBSD: RAMDISK-IP32,v 1.17 2011/05/24 20:27:11 matthew Exp $ # # THIS KERNEL IS FOR O2 (IP32) SYSTEMS ONLY. @@ -92,8 +92,6 @@ ubsa* at uhub? # Belkin serial adapter ucom* at ubsa? #ulpt* at uhub? # USB Printers umass* at uhub? # USB Mass Storage devices -atapiscsi* at umass? -scsibus* at atapiscsi? scsibus* at umass? uhidev* at uhub? # Human Interface Devices ums* at uhidev? # USB mouse |