diff options
| -rw-r--r-- | sys/arch/sparc64/conf/GENERIC | 4 | ||||
| -rw-r--r-- | sys/arch/sparc64/conf/RAMDISK | 4 | ||||
| -rw-r--r-- | sys/arch/sparc64/conf/RAMDISKU5 | 3 |
3 files changed, 3 insertions, 8 deletions
diff --git a/sys/arch/sparc64/conf/GENERIC b/sys/arch/sparc64/conf/GENERIC index f5966e92f8f..c748fba2cb7 100644 --- a/sys/arch/sparc64/conf/GENERIC +++ b/sys/arch/sparc64/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.283 2014/04/03 12:56:14 dlg Exp $ +# $OpenBSD: GENERIC,v 1.284 2014/04/05 16:33:14 deraadt Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -112,7 +112,6 @@ malo* at pcmcia? # Marvell 88W8385 # PCI SCSI ahc* at pci? # Adaptec 2940 SCSI controllers siop* at pci? # NCR 538XX SCSI controllers -#isp* at pci? # Qlogic ISP [12]0x0 SCSI/FibreChannel qlw* at pci? # QLogic ISP SCSI qla* at pci? # QLogic ISP 2[123]xx FibreChannel qle* at pci? # QLogic ISP 2[45]xx FibreChannel @@ -401,7 +400,6 @@ wd* at wdc? flags 0x0000 dma* at sbus? # SBus esp* at dma? # SBus esp* at sbus? -#isp* at sbus? qlw* at sbus? qla* at sbus? diff --git a/sys/arch/sparc64/conf/RAMDISK b/sys/arch/sparc64/conf/RAMDISK index 703e0333c7b..4fde48d2cfe 100644 --- a/sys/arch/sparc64/conf/RAMDISK +++ b/sys/arch/sparc64/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.110 2014/03/28 16:24:57 brad Exp $ +# $OpenBSD: RAMDISK,v 1.111 2014/04/05 16:33:14 deraadt Exp $ # Machine architecture; required by config(8) machine sparc64 @@ -168,14 +168,12 @@ atapiscsi* at pciide? dma* at sbus? # SBus esp* at dma? # SBus esp* at sbus? -#isp* at sbus? qla* at sbus? qlw* at sbus? softraid0 at root # Software RAID ahc* at pci? siop* at pci? -#isp* at pci? qlw* at pci? qla* at pci? option QLE_NOFIRMWARE diff --git a/sys/arch/sparc64/conf/RAMDISKU5 b/sys/arch/sparc64/conf/RAMDISKU5 index ff08d1b80d6..a2faaa8c769 100644 --- a/sys/arch/sparc64/conf/RAMDISKU5 +++ b/sys/arch/sparc64/conf/RAMDISKU5 @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISKU5,v 1.17 2011/06/29 20:52:09 matthew Exp $ +# $OpenBSD: RAMDISKU5,v 1.18 2014/04/05 16:33:14 deraadt Exp $ # Machine architecture; required by config(8) machine sparc64 @@ -59,7 +59,6 @@ wd* at pciide? flags 0x0a00 atapiscsi* at pciide? siop* at pci? -#isp* at pci? # These entries find devices on all SCSI busses and assign # unit numers dynamically. |