diff options
| author | Marco S Hyman <marc@cvs.openbsd.org> | 2000-07-08 22:09:04 +0000 |
|---|---|---|
| committer | Marco S Hyman <marc@cvs.openbsd.org> | 2000-07-08 22:09:04 +0000 |
| commit | e0d559f9572e68ccfffdaf3dbb4ef6a99f7cf3d9 (patch) | |
| tree | 68fa99f21b20c043f90413553bacfc716eeeb3ab /sys/arch/i386/conf | |
| parent | 00793703066d2cdff933f95d77b85c1eeeb83544 (diff) | |
#audio -> #audio*
Diffstat (limited to 'sys/arch/i386/conf')
| -rw-r--r-- | sys/arch/i386/conf/GENERIC | 4 | ||||
| -rw-r--r-- | sys/arch/i386/conf/RAMDISK | 18 |
2 files changed, 12 insertions, 10 deletions
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC index ae940daed40..3959de1dd2d 100644 --- a/sys/arch/i386/conf/GENERIC +++ b/sys/arch/i386/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.194 2000/07/06 05:58:12 aaron Exp $ +# $OpenBSD: GENERIC,v 1.195 2000/07/08 22:09:03 marc Exp $ # $NetBSD: GENERIC,v 1.48 1996/05/20 18:17:23 mrg Exp $ # # GENERIC -- everything that's currently supported @@ -367,7 +367,7 @@ audio* at eso? audio* at sv? audio* at neo? audio* at cmpci? -#audio at clcs? +#audio* at clcs? #audio* at uaudio? bktr0 at pci? dev ? function ? diff --git a/sys/arch/i386/conf/RAMDISK b/sys/arch/i386/conf/RAMDISK index a77bb44c905..51f98fdb1e4 100644 --- a/sys/arch/i386/conf/RAMDISK +++ b/sys/arch/i386/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.86 2000/06/28 23:40:26 krw Exp $ +# $OpenBSD: RAMDISK,v 1.87 2000/07/08 22:09:03 marc Exp $ # from: OpenBSD: INST,v 1.19 1996/11/05 03:49:13 tholo Exp # # Install kernels no longer support X. @@ -26,7 +26,9 @@ option DST=0 # daylight savings time used by RTC option SWAPPAGER # paging; REQUIRED option DEVPAGER # mmap() of devices -#makeoptions DEBUG="-g" # compile full symbol table +option DDB # in-kernel debugger +option DDB_SAFE_CONSOLE # allow break into ddb during boot +makeoptions DEBUG="-ggdb" # compile full symbol table option FFS # UFS option EXT2FS # Linux ext2fs @@ -54,7 +56,7 @@ apm0 at bios0 flags 0x0000 # flags 0x0101 to force protocol version 1.1 #option APMDEBUG isa0 at mainbus0 -eisa0 at mainbus0 +#eisa0 at mainbus0 pci* at mainbus0 option PCIVERBOSE @@ -111,10 +113,10 @@ aha0 at isa? port 0x330 irq ? drq ? # Adaptec 154[02] SCSI controllers aha1 at isa? port 0x334 irq ? drq ? # Adaptec 154[02] SCSI controllers aha* at isapnp? scsibus* at aha? -ahb* at eisa? slot ? # Adaptec 174[024] SCSI controllers -scsibus* at ahb? +#ahb* at eisa? slot ? # Adaptec 174[024] SCSI controllers +#scsibus* at ahb? ahc0 at isa? port ? irq ? # Adaptec 284x SCSI controllers -ahc* at eisa? slot ? # Adaptec 274x, aic7770 SCSI controllers +#ahc* at eisa? slot ? # Adaptec 274x, aic7770 SCSI controllers ahc* at pci? dev ? function ? # Adaptec 2940 SCSI controllers scsibus* at ahc? #isp* at pci? dev ? function ? # Qlogic ISP [12]0x0 SCSI/FibreChannel @@ -186,8 +188,8 @@ ef* at isapnp? # 3C515 PnP ethernet #ie1 at isa? port 0x300 irq 10 # EtherExpress le0 at isa? port 0x360 irq 15 drq 6 # IsoLan, NE2100, and DEPCA #ex0 at isa? port 0x320 irq 5 # Intel EtherExpress PRO/10 -ep0 at eisa? slot ? -ep* at eisa? slot ? # 3C579 ethernet cards +#ep0 at eisa? slot ? +#ep* at eisa? slot ? # 3C579 ethernet cards #fea* at eisa? slot ? # DEC DEFEA FDDI cards le* at pci? dev ? function ? # PCnet-PCI based ethernet cards ep* at isapnp? # 3C509 PnP ethernet cards |