diff options
Diffstat (limited to 'sys/arch/sgi/conf')
| -rw-r--r-- | sys/arch/sgi/conf/GENERIC-IP27 | 8 | ||||
| -rw-r--r-- | sys/arch/sgi/conf/GENERIC-IP30 | 8 | ||||
| -rw-r--r-- | sys/arch/sgi/conf/GENERIC-IP32 | 8 | ||||
| -rw-r--r-- | sys/arch/sgi/conf/RAMDISK-IP27 | 8 | ||||
| -rw-r--r-- | sys/arch/sgi/conf/RAMDISK-IP30 | 8 | ||||
| -rw-r--r-- | sys/arch/sgi/conf/RAMDISK-IP32 | 8 |
6 files changed, 12 insertions, 36 deletions
diff --git a/sys/arch/sgi/conf/GENERIC-IP27 b/sys/arch/sgi/conf/GENERIC-IP27 index 26c5258e5ca..67c7df04275 100644 --- a/sys/arch/sgi/conf/GENERIC-IP27 +++ b/sys/arch/sgi/conf/GENERIC-IP27 @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC-IP27,v 1.41 2011/05/24 20:27:11 matthew Exp $ +# $OpenBSD: GENERIC-IP27,v 1.42 2011/06/29 20:52:09 matthew Exp $ # # THIS KERNEL IS FOR Origin, Onyx, Fuel, Tezro (IP27, IP35) SYSTEMS ONLY. # @@ -80,10 +80,6 @@ isp* at pci? mpi* at pci? siop* at pci? -scsibus* at ahc? -scsibus* at isp? -scsibus* at mpi? -scsibus* at siop? # CardBus bus support cbb* at pci? @@ -117,7 +113,6 @@ uaudio* at uhub? # USB Audio audio* at uaudio? ulpt* at uhub? # USB Printers umass* at uhub? # USB Mass Storage devices -scsibus* at umass? urio* at uhub? # Diamond Multimedia Rio 500 uscanner* at uhub? disable# USB Scanners uhidev* at uhub? # Human Interface Devices @@ -252,6 +247,7 @@ wskbd* at pckbd? mux 1 wsmouse* at pms? mux 0 #### SCSI Bus devices +scsibus* at scsi? sd* at scsibus? st* at scsibus? cd* at scsibus? diff --git a/sys/arch/sgi/conf/GENERIC-IP30 b/sys/arch/sgi/conf/GENERIC-IP30 index 722c6755eac..2af4986d2c6 100644 --- a/sys/arch/sgi/conf/GENERIC-IP30 +++ b/sys/arch/sgi/conf/GENERIC-IP30 @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC-IP30,v 1.35 2011/05/24 20:27:11 matthew Exp $ +# $OpenBSD: GENERIC-IP30,v 1.36 2011/06/29 20:52:09 matthew Exp $ # # THIS KERNEL IS FOR Octane and Octane 2 (IP30) SYSTEMS ONLY. # @@ -72,10 +72,6 @@ isp* at pci? mpi* at pci? siop* at pci? -scsibus* at ahc? -scsibus* at isp? -scsibus* at mpi? -scsibus* at siop? # CardBus bus support cbb* at pci? @@ -109,7 +105,6 @@ uaudio* at uhub? # USB Audio audio* at uaudio? ulpt* at uhub? # USB Printers umass* at uhub? # USB Mass Storage devices -scsibus* at umass? urio* at uhub? # Diamond Multimedia Rio 500 uscanner* at uhub? disable# USB Scanners uhidev* at uhub? # Human Interface Devices @@ -244,6 +239,7 @@ wskbd* at pckbd? mux 1 wsmouse* at pms? mux 0 #### SCSI Bus devices +scsibus* at scsi? sd* at scsibus? st* at scsibus? cd* at scsibus? diff --git a/sys/arch/sgi/conf/GENERIC-IP32 b/sys/arch/sgi/conf/GENERIC-IP32 index 31163d6e61d..a5d0ce3401b 100644 --- a/sys/arch/sgi/conf/GENERIC-IP32 +++ b/sys/arch/sgi/conf/GENERIC-IP32 @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC-IP32,v 1.26 2011/05/24 20:27:11 matthew Exp $ +# $OpenBSD: GENERIC-IP32,v 1.27 2011/06/29 20:52:09 matthew Exp $ # # THIS KERNEL IS FOR O2 (IP32) SYSTEMS ONLY. # @@ -64,10 +64,6 @@ isp* at pci? mpi* at pci? siop* at pci? -scsibus* at ahc? -scsibus* at isp? -scsibus* at mpi? -scsibus* at siop? # CardBus bus support cbb* at pci? @@ -101,7 +97,6 @@ uaudio* at uhub? # USB Audio audio* at uaudio? ulpt* at uhub? # USB Printers umass* at uhub? # USB Mass Storage devices -scsibus* at umass? urio* at uhub? # Diamond Multimedia Rio 500 uscanner* at uhub? disable# USB Scanners uhidev* at uhub? # Human Interface Devices @@ -240,6 +235,7 @@ wskbd* at pckbd? mux 1 wsmouse* at pms? mux 0 #### SCSI Bus devices +scsibus* at scsi? sd* at scsibus? st* at scsibus? cd* at scsibus? diff --git a/sys/arch/sgi/conf/RAMDISK-IP27 b/sys/arch/sgi/conf/RAMDISK-IP27 index 46ca2425e3e..d9c75d0a006 100644 --- a/sys/arch/sgi/conf/RAMDISK-IP27 +++ b/sys/arch/sgi/conf/RAMDISK-IP27 @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK-IP27,v 1.25 2011/05/24 20:27:11 matthew Exp $ +# $OpenBSD: RAMDISK-IP27,v 1.26 2011/06/29 20:52:09 matthew Exp $ # # THIS KERNEL IS FOR Origin, Onyx, Fuel, Tezro (IP27, IP35) SYSTEMS ONLY. @@ -109,7 +109,6 @@ ubsa* at uhub? # Belkin serial adapter ucom* at ubsa? #ulpt* at uhub? # USB Printers umass* at uhub? # USB Mass Storage devices -scsibus* at umass? uhidev* at uhub? # Human Interface Devices ums* at uhidev? # USB mouse wsmouse* at ums? mux 0 @@ -205,11 +204,8 @@ wskbd* at pckbd? mux 1 wsmouse* at pms? mux 0 #### SCSI Bus devices -scsibus* at ahc? -scsibus* at isp? -scsibus* at mpi? -scsibus* at siop? +scsibus* at scsi? sd* at scsibus? st* at scsibus? cd* at scsibus? diff --git a/sys/arch/sgi/conf/RAMDISK-IP30 b/sys/arch/sgi/conf/RAMDISK-IP30 index 0b75b55436b..4dbe2f73a08 100644 --- a/sys/arch/sgi/conf/RAMDISK-IP30 +++ b/sys/arch/sgi/conf/RAMDISK-IP30 @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK-IP30,v 1.21 2011/05/24 20:27:11 matthew Exp $ +# $OpenBSD: RAMDISK-IP30,v 1.22 2011/06/29 20:52:09 matthew Exp $ # # THIS KERNEL IS FOR Octane and Octane 2 (IP30) SYSTEMS ONLY. @@ -102,7 +102,6 @@ ubsa* at uhub? # Belkin serial adapter ucom* at ubsa? #ulpt* at uhub? # USB Printers umass* at uhub? # USB Mass Storage devices -scsibus* at umass? uhidev* at uhub? # Human Interface Devices ums* at uhidev? # USB mouse wsmouse* at ums? mux 0 @@ -198,11 +197,8 @@ wskbd* at pckbd? mux 1 wsmouse* at pms? mux 0 #### SCSI Bus devices -scsibus* at ahc? -scsibus* at isp? -scsibus* at mpi? -scsibus* at siop? +scsibus* at scsi? sd* at scsibus? st* at scsibus? cd* at scsibus? diff --git a/sys/arch/sgi/conf/RAMDISK-IP32 b/sys/arch/sgi/conf/RAMDISK-IP32 index 45c4386f143..c058c6c9a56 100644 --- a/sys/arch/sgi/conf/RAMDISK-IP32 +++ b/sys/arch/sgi/conf/RAMDISK-IP32 @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK-IP32,v 1.17 2011/05/24 20:27:11 matthew Exp $ +# $OpenBSD: RAMDISK-IP32,v 1.18 2011/06/29 20:52:09 matthew Exp $ # # THIS KERNEL IS FOR O2 (IP32) SYSTEMS ONLY. @@ -92,7 +92,6 @@ ubsa* at uhub? # Belkin serial adapter ucom* at ubsa? #ulpt* at uhub? # USB Printers umass* at uhub? # USB Mass Storage devices -scsibus* at umass? uhidev* at uhub? # Human Interface Devices ums* at uhidev? # USB mouse wsmouse* at ums? mux 0 @@ -189,11 +188,8 @@ pckbd* at mkbc? wskbd* at pckbd? console ? #### SCSI Bus devices -scsibus* at ahc? -scsibus* at isp? -scsibus* at mpi? -scsibus* at siop? +scsibus* at scsi? sd* at scsibus? st* at scsibus? cd* at scsibus? |