diff options
Diffstat (limited to 'sys/arch/sparc64/conf')
| -rw-r--r-- | sys/arch/sparc64/conf/GENERIC | 5 | ||||
| -rw-r--r-- | sys/arch/sparc64/conf/RAMDISK | 7 | ||||
| -rw-r--r-- | sys/arch/sparc64/conf/RAMDISKU5 | 5 |
3 files changed, 6 insertions, 11 deletions
diff --git a/sys/arch/sparc64/conf/GENERIC b/sys/arch/sparc64/conf/GENERIC index ab8ead7732b..3c9b6cecc21 100644 --- a/sys/arch/sparc64/conf/GENERIC +++ b/sys/arch/sparc64/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.239 2009/06/04 00:26:17 kettenis Exp $ +# $OpenBSD: GENERIC,v 1.240 2009/06/24 11:38:40 deraadt Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -111,7 +111,6 @@ scsibus* at ahc? siop* at pci? # NCR 538XX SCSI controllers scsibus* at siop? isp* at pci? # Qlogic ISP [12]0x0 SCSI/FibreChannel -option ISP_COMPILE_FW=1 pcscp* at pci? # AMD 53c974 PCscsi-PCI SCSI scsibus* at pcscp? mpi* at pci? # LSI Logic Fusion MPT Message Passing Interface @@ -394,9 +393,7 @@ wd* at wdc? flags 0x0000 dma* at sbus? # SBus esp* at dma? # SBus esp* at sbus? - isp* at sbus? -option ISP_COMPILE_1000_FW=1 # SCSI bus layer. SCSI devices attach to the SCSI bus, which attaches # to the underlying hardware controller. diff --git a/sys/arch/sparc64/conf/RAMDISK b/sys/arch/sparc64/conf/RAMDISK index a578460de87..afa4c9e57fa 100644 --- a/sys/arch/sparc64/conf/RAMDISK +++ b/sys/arch/sparc64/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.90 2009/06/04 00:26:17 kettenis Exp $ +# $OpenBSD: RAMDISK,v 1.91 2009/06/24 11:38:40 deraadt Exp $ # Machine architecture; required by config(8) machine sparc64 @@ -163,7 +163,6 @@ dma* at sbus? # SBus esp* at dma? # SBus esp* at sbus? isp* at sbus? -option ISP_COMPILE_1000_FW=1 scsibus* at esp? ahc* at pci? @@ -177,14 +176,13 @@ ahci* at jmb? pciide* at jmb? ahci* at pci? -option ISP_COMPILE_FW=1 scsibus* at ahc? scsibus* at siop? -scsibus* at isp? scsibus* at mpi? scsibus* at sili? scsibus* at arc? scsibus* at ahci? +scsibus* at isp? # These entries find devices on all SCSI busses and assign # unit numers dynamically. @@ -321,3 +319,4 @@ pseudo-device rd 2 # ramdisk pseudo-device loop 1 # network loopback pseudo-device bpfilter 1 # packet filter pseudo-device vlan # IEEE 802.1Q VLAN +pseudo-device bio 1 diff --git a/sys/arch/sparc64/conf/RAMDISKU5 b/sys/arch/sparc64/conf/RAMDISKU5 index 4f2be56df61..0c36748a2a8 100644 --- a/sys/arch/sparc64/conf/RAMDISKU5 +++ b/sys/arch/sparc64/conf/RAMDISKU5 @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISKU5,v 1.15 2009/06/04 00:26:17 kettenis Exp $ +# $OpenBSD: RAMDISKU5,v 1.16 2009/06/24 11:38:40 deraadt Exp $ # Machine architecture; required by config(8) machine sparc64 @@ -60,9 +60,8 @@ atapiscsi* at pciide? scsibus* at atapiscsi? siop* at pci? -#isp* at pci? -#option ISP_COMPILE_FW=1 scsibus* at siop? +#isp* at pci? #scsibus* at isp? # These entries find devices on all SCSI busses and assign |