diff options
| author | Matthew Dempsky <matthew@cvs.openbsd.org> | 2011-06-29 20:52:10 +0000 |
|---|---|---|
| committer | Matthew Dempsky <matthew@cvs.openbsd.org> | 2011-06-29 20:52:10 +0000 |
| commit | 1c63422424678d077b8f6207ad065ce1012cd7ec (patch) | |
| tree | f06aa763bb28acf5e131818fd79869e578f2addd /sys/arch/alpha/conf/GENERIC | |
| parent | ad0b39e32d3724d10b4909d983b7289f9f4d7874 (diff) | |
Replace all instances of "scsibus* at hba?" with a single "scsibus* at
scsi?" rule, similar to how ethernet PHY drivers attach at mii.
Discussed on icb.
Diffstat (limited to 'sys/arch/alpha/conf/GENERIC')
| -rw-r--r-- | sys/arch/alpha/conf/GENERIC | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/sys/arch/alpha/conf/GENERIC b/sys/arch/alpha/conf/GENERIC index 23c906a21f3..7b929dd1334 100644 --- a/sys/arch/alpha/conf/GENERIC +++ b/sys/arch/alpha/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.222 2011/05/24 20:27:11 matthew Exp $ +# $OpenBSD: GENERIC,v 1.223 2011/06/29 20:52:08 matthew Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -90,7 +90,6 @@ umidi* at uhub? # USB MIDI midi* at umidi? 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 @@ -162,7 +161,6 @@ scc0 at ioasic? scc1 at ioasic? tcds* at tc? asc* at tcds? -scsibus* at asc? asc* at tc? #cfb* at tc? #sfb* at tc? @@ -195,31 +193,19 @@ cy* at pci? # PCI cyclom card # PCI SCSI devices ahc* at pci? # Adaptec 2940 SCSI controllers -scsibus* at ahc? isp* at pci? # Qlogic ISP [12]0x0 SCSI/FibreChannel -scsibus* at isp? siop* at pci? # NCR 53c8xx SCSI -scsibus* at siop? pcscp* at pci? # AMD 53c974 PCscsi-PCI SCSI -scsibus* at pcscp? twe* at pci? # 3ware Escalade RAID controllers -scsibus* at twe? mpi* at pci? # LSI Logic Message Passing Interface -scsibus* at mpi? sili* at pci? # Silicon Image 3124/3132/3531 SATA -scsibus* at sili? #UNTESTED: the following drivers are untested. adw* at pci? # AdvanSys ULTRA WIDE SCSI -scsibus* at adw? ciss* at pci? # Compaq Smart ARRAY [56]* RAID controllers -scsibus* at ciss? gdt* at pci? # ICP Vortex GDT RAID controllers -scsibus* at gdt? #adv* at pci? # AdvanSys 1200A/B and ULTRA SCSI -#scsibus* at adv? #ami* at pci? # AMI MegaRAID controllers -#scsibus* at ami? # Networking devices lmc* at pci? # Lan Media Corp SSI/T3/HSSI @@ -355,7 +341,6 @@ fdc0 at isa? port 0x3f0 irq 6 drq 2 # floppy controller fd* at fdc? #aic0 at isa? port 0x340 irq 11 # Adaptec 152[02] SCSI -#scsibus* at aic? # option for using CD1400 handshaking for incoming data # requires a special cable that exchanges the RTS and DTR lines @@ -367,6 +352,7 @@ fea* at eisa? # DEC DEFEA FDDI cards ahc* at eisa? # Adaptec 274x, aic7770 SCSI # SCSI devices +scsibus* at scsi? cd* at scsibus? sd* at scsibus? st* at scsibus? @@ -385,7 +371,6 @@ wd* at pciide? flags 0x0000 # ATAPI<->SCSI atapiscsi* at wdc? atapiscsi* at pciide? -scsibus* at atapiscsi? # Audio devices cmpci* at pci? # C-Media CMI8338/8738 |