Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove "atapibus* at umass?" and "scsibus* at umass?" when there is

Browse Source 
already an attachment to the interface attribute (atapi and scsi).

Part of PR#34085, although it is the contrary to what the submitter
suggests (which shows that having both in a config file can be confusing).
This commit is contained in:
cube 2006-07-26 07:00:23 +00:00
parent 79d79919df
commit cad5e9a56c
10 changed files with 16 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/arch/alpha/conf/ALPHA
View File

@ -1,4 +1,4 @@
# $NetBSD: ALPHA,v 1.216 2006/03/28 20:58:39 pavel Exp $
# $NetBSD: ALPHA,v 1.217 2006/07/26 07:00:23 cube Exp $
#
# Alpha kernel with all the options you'd want, and more.
@ -6,7 +6,7 @@ include "arch/alpha/conf/std.alpha"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
ident "ALPHA-$Revision: 1.216 $"
ident "ALPHA-$Revision: 1.217 $"
maxusers 32
@ -527,8 +527,6 @@ ucom* at umodem?
# USB Mass Storage
umass* at uhub? port ? configuration ? interface ?
atapibus* at umass?
scsibus* at umass? channel ?
# USB audio
uaudio* at uhub? port ? configuration ?

5
sys/arch/alpha/conf/BASIL
View File

@ -1,4 +1,4 @@
# $NetBSD: BASIL,v 1.44 2006/02/05 05:01:48 cube Exp $
# $NetBSD: BASIL,v 1.45 2006/07/26 07:00:23 cube Exp $
#
# basil.shagadelic.org -- thorpej's API UP1000
@ -6,7 +6,7 @@ include "arch/alpha/conf/std.alpha"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
#ident "BASIL-$Revision: 1.44 $"
#ident "BASIL-$Revision: 1.45 $"
maxusers 64
@ -431,7 +431,6 @@ ucom* at umodem?
# USB Mass Storage
umass* at uhub? port ? configuration ? interface ?
atapibus* at umass?
scsibus* at umass? channel ?
# USB Ethernet adapters

4
sys/arch/alpha/conf/GENERIC
View File

@ -22,7 +22,7 @@ include "arch/alpha/conf/std.alpha"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
#ident "GENERIC-$Revision: 1.288 $"
#ident "GENERIC-$Revision: 1.289 $"
maxusers 32
@ -539,8 +539,6 @@ ucom* at umodem?
# USB Mass Storage
umass* at uhub? port ? configuration ? interface ?
atapibus* at umass?
scsibus* at umass? channel ?
# USB audio
uaudio* at uhub? port ? configuration ?

3
sys/arch/cats/conf/GENERIC
View File

@ -1,4 +1,4 @@
# $NetBSD: GENERIC,v 1.105 2006/06/28 15:19:27 liamjfoy Exp $
# $NetBSD: GENERIC,v 1.106 2006/07/26 07:00:23 cube Exp $
#
# GENERIC machine description file
#
@ -397,7 +397,6 @@ ucom* at umodem?
# USB Mass Storage
umass* at uhub? port ? configuration ? interface ?
atapibus* at umass?
scsibus* at umass? channel ?
# USB audio

3
sys/arch/evbarm/conf/HDL_G
View File

@ -1,4 +1,4 @@
# $NetBSD: HDL_G,v 1.1 2006/04/16 02:22:33 nonaka Exp $
# $NetBSD: HDL_G,v 1.2 2006/07/26 07:00:23 cube Exp $
#
# HDL_G -- I-O DATA HDL-G Kernel
#
@ -300,7 +300,6 @@ ucom* at umodem?
# USB Mass Storage
umass* at uhub? port ? configuration ? interface ?
scsibus* at umass?
wd* at umass?
# USB audio

5
sys/arch/hpcmips/conf/GENERIC
View File

@ -1,4 +1,4 @@
# $NetBSD: GENERIC,v 1.187 2006/06/28 15:19:27 liamjfoy Exp $
# $NetBSD: GENERIC,v 1.188 2006/07/26 07:00:24 cube Exp $
#
# GENERIC machine description file
#
@ -24,7 +24,7 @@ include "arch/hpcmips/conf/std.hpcmips.tx39"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
#ident "GENERIC-$Revision: 1.187 $"
#ident "GENERIC-$Revision: 1.188 $"
maxusers 16
@ -578,7 +578,6 @@ ucom* at umodem?
# USB Mass Storage
umass* at uhub? port ? configuration ? interface ?
atapibus* at umass?
scsibus* at umass? channel ?
# USB audio

3
sys/arch/hpcmips/conf/TX3922
View File

@ -1,7 +1,7 @@
#
# Distribution kernel (TOSHIBA TX3922 based model) kernel config file
#
# $NetBSD: TX3922,v 1.75 2006/03/28 20:58:40 pavel Exp $
# $NetBSD: TX3922,v 1.76 2006/07/26 07:00:24 cube Exp $
#
include "arch/hpcmips/conf/std.hpcmips"
@ -212,7 +212,6 @@ ucom* at umodem?
# USB Mass Storage
umass* at uhub? port ? configuration ? interface ?
atapibus* at umass?
scsibus* at umass? channel ?
# USB audio

5
sys/arch/hpcmips/conf/VR41XX
View File

@ -1,4 +1,4 @@
# $NetBSD: VR41XX,v 1.38 2006/03/28 20:58:40 pavel Exp $
# $NetBSD: VR41XX,v 1.39 2006/07/26 07:00:24 cube Exp $
#
# GENERIC machine description file
#
@ -20,7 +20,7 @@
include "arch/hpcmips/conf/std.hpcmips"
include "arch/hpcmips/conf/std.hpcmips.vr41"
#ident "GENERIC-$Revision: 1.38 $"
#ident "GENERIC-$Revision: 1.39 $"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
@ -446,7 +446,6 @@ ucom* at umodem?
# USB Mass Storage
umass* at uhub? port ? configuration ? interface ?
atapibus* at umass?
scsibus* at umass? channel ?
# USB audio

7
sys/arch/macppc/conf/GENERIC
View File

@ -1,4 +1,4 @@
# $NetBSD: GENERIC,v 1.229 2006/03/28 20:58:40 pavel Exp $
# $NetBSD: GENERIC,v 1.230 2006/07/26 07:00:23 cube 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.229 $"
#ident "GENERIC-$Revision: 1.230 $"
maxusers 32
@ -437,8 +437,6 @@ umodem* at uhub? port ? configuration ? # USB Modem
ucom* at umodem?
umass* at uhub? port ? configuration ? interface ? # USB Mass Storage
atapibus* at umass?
scsibus* at umass? channel ?
uaudio* at uhub? port ? configuration ? # USB audio
@ -474,7 +472,6 @@ fwohci* at pci? dev ? function ? # IEEE1394 Open Host Controller
ieee1394if* at fwohci?
fwip* at ieee1394if? # IP over IEEE1394
sbp* at ieee1394if? euihi ? euilo ?
scsibus* at sbp?
# Audio Devices

5
sys/arch/sparc64/conf/GENERIC
View File

@ -1,4 +1,4 @@
# $NetBSD: GENERIC,v 1.56 2006/07/15 07:55:20 elad Exp $
# $NetBSD: GENERIC,v 1.57 2006/07/26 07:00:23 cube Exp $
#
# GENERIC machine description file
#
@ -22,7 +22,7 @@ include "arch/sparc64/conf/std.sparc64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
#ident "GENERIC-$Revision: 1.56 $"
#ident "GENERIC-$Revision: 1.57 $"
maxusers 64
@ -575,7 +575,6 @@ ucom* at umodem?
# USB Mass Storage
umass* at uhub? port ? configuration ? interface ?
scsibus* at umass?
wd* at umass?
# USB audio