From fe980f65d450bd7d4e6f5492b26ec837ac9f58b2 Mon Sep 17 00:00:00 2001 From: tron Date: Tue, 31 May 2005 22:09:08 +0000 Subject: [PATCH] Remove unnecessary per-driver scsibus attachments and use "scsibus* at scsi?" instead. --- sys/arch/macppc/conf/GENERIC | 17 +++-------------- sys/arch/macppc/conf/INSTALL | 11 ++--------- sys/arch/macppc/conf/POWERMAC | 5 ++--- 3 files changed, 7 insertions(+), 26 deletions(-) diff --git a/sys/arch/macppc/conf/GENERIC b/sys/arch/macppc/conf/GENERIC index 3c321924d62a..d2b2649f758f 100644 --- a/sys/arch/macppc/conf/GENERIC +++ b/sys/arch/macppc/conf/GENERIC @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.195 2005/04/15 17:27:21 itohy Exp $ +# $NetBSD: GENERIC,v 1.196 2005/05/31 22:09:08 tron Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/macppc/conf/std.macppc" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.195 $" +#ident "GENERIC-$Revision: 1.196 $" maxusers 32 @@ -358,18 +358,7 @@ wsmouse* at ams? #ubsec* at pci? dev ? function ? # Broadcom 5501/5601/580x/582x -scsibus* at adv? -scsibus* at adw? -scsibus* at ahc? -scsibus* at bha? -scsibus* at iha? -scsibus* at isp? -scsibus* at esp? -scsibus* at mesh? -scsibus* at pcscp? -scsibus* at siop? -scsibus* at esiop? -scsibus* at trm? +scsibus* at scsi? sd* at scsibus? target ? lun ? # SCSI disks st* at scsibus? target ? lun ? # SCSI tape drives diff --git a/sys/arch/macppc/conf/INSTALL b/sys/arch/macppc/conf/INSTALL index 005eda258a86..10c41ee76421 100644 --- a/sys/arch/macppc/conf/INSTALL +++ b/sys/arch/macppc/conf/INSTALL @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL,v 1.87 2005/02/18 21:05:52 dsl Exp $ +# $NetBSD: INSTALL,v 1.88 2005/05/31 22:09:08 tron Exp $ # # config file for INSTALL FLOPPY # @@ -156,14 +156,7 @@ wdc* at mediabay? flags 0 wsdisplay0 at ofb? console ? wskbd0 at akbd? console ? -scsibus* at adv? -scsibus* at adw? -scsibus* at ahc? -scsibus* at esp? -scsibus* at iha? -scsibus* at mesh? -scsibus* at pcscp? -scsibus* at siop? +scsibus* at scsi? sd* at scsibus? target ? lun ? # SCSI disks cd* at scsibus? target ? lun ? # SCSI CD-ROM drives diff --git a/sys/arch/macppc/conf/POWERMAC b/sys/arch/macppc/conf/POWERMAC index e0462fbf8a9b..321cf686fd36 100644 --- a/sys/arch/macppc/conf/POWERMAC +++ b/sys/arch/macppc/conf/POWERMAC @@ -1,4 +1,4 @@ -# $NetBSD: POWERMAC,v 1.46 2005/02/25 13:46:50 simonb Exp $ +# $NetBSD: POWERMAC,v 1.47 2005/05/31 22:09:08 tron Exp $ # # POWERMAC config file # @@ -99,8 +99,7 @@ wsdisplay0 at ofb? console ? wskbd0 at akbd? console ? wsmouse0 at ams? -scsibus* at esp? -scsibus* at mesh? +scsibus* at scsi? sd* at scsibus? target ? lun ? # SCSI disks pseudo-device loop # network loopback