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/hppa64 | |
| 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/hppa64')
| -rw-r--r-- | sys/arch/hppa64/conf/GENERIC | 7 | ||||
| -rw-r--r-- | sys/arch/hppa64/conf/RAMDISK | 9 |
2 files changed, 4 insertions, 12 deletions
diff --git a/sys/arch/hppa64/conf/GENERIC b/sys/arch/hppa64/conf/GENERIC index 95911400185..9024d18c91f 100644 --- a/sys/arch/hppa64/conf/GENERIC +++ b/sys/arch/hppa64/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.24 2011/05/24 20:27:11 matthew Exp $ +# $OpenBSD: GENERIC,v 1.25 2011/06/29 20:52:09 matthew Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -87,7 +87,6 @@ pci* at ppb? #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 @@ -121,9 +120,7 @@ pci* at ppb? #ie* at pci? siop* at pci? # NCR 538XX SCSI controllers(new) -scsibus* at siop? #ahd* at pci? # Adaptec 79?? SCSI controllers -#scsibus* at ahd? #em* at pci? # Intel Pro/1000 ethernet #ti* at pci? # Alteon Tigon 1Gb ethernet @@ -171,10 +168,10 @@ ukphy* at mii? # generic unknown PHYs #wd* at wdc? flags 0x0000 #wd* at pciide? flags 0x0000 #atapiscsi* at pciide? -#scsibus* at atapiscsi? # These entries find devices on all SCSI busses and assign # unit numers dynamically. +scsibus* at scsi? sd* at scsibus? #st* at scsibus? #cd* at scsibus? diff --git a/sys/arch/hppa64/conf/RAMDISK b/sys/arch/hppa64/conf/RAMDISK index e1949ba0901..533915a7738 100644 --- a/sys/arch/hppa64/conf/RAMDISK +++ b/sys/arch/hppa64/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.11 2011/05/24 20:27:11 matthew Exp $ +# $OpenBSD: RAMDISK,v 1.12 2011/06/29 20:52:09 matthew Exp $ # # Diskless kernel config # @@ -88,7 +88,6 @@ pcmcia* at cardslot? #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 @@ -120,15 +119,11 @@ pcmcia* at cardslot? #ep* at pci? # 3c59x ethernets ahc* at pci? # Adaptec 2940 SCSI controllers -scsibus* at ahc? #option BHADEBUG #bha* at pci? -#scsibus* at bha? siop* at pci? # NCR 538XX SCSI controllers(new) -scsibus* at siop? #ahd* at pci? # Adaptec 79?? SCSI controllers -#scsibus* at ahd? #em* at pci? # Intel Pro/1000 ethernet #ti* at pci? # Alteon Tigon 1Gb ethernet @@ -176,10 +171,10 @@ ukphy* at mii? # generic unknown PHYs #wd* at wdc? flags 0x0000 #wd* at pciide? flags 0x0000 #atapiscsi* at pciide? -#scsibus* at atapiscsi? # These entries find devices on all SCSI busses and assign # unit numers dynamically. +scsibus* at scsi? sd* at scsibus? st* at scsibus? cd* at scsibus? |