diff options
Diffstat (limited to 'sys/arch/i386')
| -rw-r--r-- | sys/arch/i386/conf/GENERIC | 4 | ||||
| -rw-r--r-- | sys/arch/i386/conf/HERMES | 4 | ||||
| -rw-r--r-- | sys/arch/i386/conf/LUCIFIER | 4 | ||||
| -rw-r--r-- | sys/arch/i386/conf/NETTAN | 6 | ||||
| -rw-r--r-- | sys/arch/i386/conf/PETRA | 6 | ||||
| -rw-r--r-- | sys/arch/i386/conf/RAMDISK | 4 | ||||
| -rw-r--r-- | sys/arch/i386/conf/RAMDISKB | 4 | ||||
| -rw-r--r-- | sys/arch/i386/conf/RAMDISK_CD | 4 |
8 files changed, 18 insertions, 18 deletions
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC index ff9f80e9eef..642f82195fe 100644 --- a/sys/arch/i386/conf/GENERIC +++ b/sys/arch/i386/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.187 2000/06/07 22:31:16 mickey Exp $ +# $OpenBSD: GENERIC,v 1.188 2000/06/08 00:16:02 mickey Exp $ # $NetBSD: GENERIC,v 1.48 1996/05/20 18:17:23 mrg Exp $ # # GENERIC -- everything that's currently supported @@ -36,7 +36,7 @@ config bsd swap generic mainbus0 at root bios0 at mainbus0 -apm0 at bios0 # flags 0x0101 to force protocol version 1.1 +apm0 at bios0 flags 0x0000 # flags 0x0101 to force protocol version 1.1 isa0 at mainbus0 isa0 at pcib? diff --git a/sys/arch/i386/conf/HERMES b/sys/arch/i386/conf/HERMES index 23ab9914a97..7e81b15fd31 100644 --- a/sys/arch/i386/conf/HERMES +++ b/sys/arch/i386/conf/HERMES @@ -1,4 +1,4 @@ -# $OpenBSD: HERMES,v 1.20 1999/10/03 21:08:15 niklas Exp $ +# $OpenBSD: HERMES,v 1.21 2000/06/08 00:16:03 mickey Exp $ # # HERMES -- 450MHz Pentium II PCI, APM, PnP # @@ -89,7 +89,7 @@ config bsd root on sd0 swap on sd0 and wd0 dumps on sd0 mainbus0 at root bios0 at mainbus0 -apm0 at bios0 +apm0 at bios0 flags 0x0000 # flags 0x0101 to force protocol version 1.1 pci* at mainbus0 bus ? option PCIVERBOSE diff --git a/sys/arch/i386/conf/LUCIFIER b/sys/arch/i386/conf/LUCIFIER index c8207b18556..926c32b6ef4 100644 --- a/sys/arch/i386/conf/LUCIFIER +++ b/sys/arch/i386/conf/LUCIFIER @@ -1,4 +1,4 @@ -# $OpenBSD: LUCIFIER,v 1.23 1999/12/05 02:50:15 mickey Exp $ +# $OpenBSD: LUCIFIER,v 1.24 2000/06/08 00:16:03 mickey Exp $ # machine i386 @@ -53,7 +53,7 @@ config bsd swap generic mainbus0 at root bios0 at mainbus0 -apm0 at bios0 +apm0 at bios0 flags 0x0000 # flags 0x0101 to force protocol version 1.1 #option EISAVERBOSE #eisa0 at mainbus0 diff --git a/sys/arch/i386/conf/NETTAN b/sys/arch/i386/conf/NETTAN index d2d558c0115..6b0be8516f8 100644 --- a/sys/arch/i386/conf/NETTAN +++ b/sys/arch/i386/conf/NETTAN @@ -1,4 +1,4 @@ -# $OpenBSD: NETTAN,v 1.38 2000/03/02 18:38:27 mickey Exp $ +# $OpenBSD: NETTAN,v 1.39 2000/06/08 00:16:03 mickey Exp $ # # NETTAN -- Applitron Datasystem AB # @@ -6,7 +6,7 @@ machine i386 # architecture, used by config; REQUIRED #include "../../../conf/GENERIC" -# $OpenBSD: NETTAN,v 1.38 2000/03/02 18:38:27 mickey Exp $ +# $OpenBSD: NETTAN,v 1.39 2000/06/08 00:16:03 mickey Exp $ # # Machine-independent option; used by all architectures for their # GENERIC kernel @@ -130,7 +130,7 @@ config bsd swap generic mainbus0 at root bios0 at mainbus0 -apm0 at bios0 +apm0 at bios0 flags 0x0000 # flags 0x0101 to force protocol version 1.1 isa0 at mainbus0 eisa0 at mainbus0 diff --git a/sys/arch/i386/conf/PETRA b/sys/arch/i386/conf/PETRA index d1f89a43cf0..3c6262348e3 100644 --- a/sys/arch/i386/conf/PETRA +++ b/sys/arch/i386/conf/PETRA @@ -1,4 +1,4 @@ -# $OpenBSD: PETRA,v 1.21 2000/03/27 23:19:23 deraadt Exp $ +# $OpenBSD: PETRA,v 1.22 2000/06/08 00:16:03 mickey Exp $ # # PETRA -- everything that's currently supported with certain # changes for Applitron's fileserver petra, a 128 MB @@ -10,7 +10,7 @@ machine i386 # architecture, used by config; REQUIRED makeoptions DEBUG="-g" # make a bsd.gdb too #include "../../../conf/GENERIC" -# $OpenBSD: PETRA,v 1.21 2000/03/27 23:19:23 deraadt Exp $ +# $OpenBSD: PETRA,v 1.22 2000/06/08 00:16:03 mickey Exp $ # # Machine-independent option; used by all architectures for their # GENERIC kernel @@ -131,7 +131,7 @@ config bsd root on sd0a swap on ccd0b dumps on sd1a mainbus0 at root bios0 at mainbus0 -apm0 at bios0 +apm0 at bios0 flags 0x0000 # flags 0x0101 to force protocol version 1.1 isa0 at mainbus0 isa0 at pcib? diff --git a/sys/arch/i386/conf/RAMDISK b/sys/arch/i386/conf/RAMDISK index 2bd9a81e046..671aae6a195 100644 --- a/sys/arch/i386/conf/RAMDISK +++ b/sys/arch/i386/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.84 2000/06/06 23:09:06 deraadt Exp $ +# $OpenBSD: RAMDISK,v 1.85 2000/06/08 00:16:03 mickey Exp $ # from: OpenBSD: INST,v 1.19 1996/11/05 03:49:13 tholo Exp # # Install kernels no longer support X. @@ -50,7 +50,7 @@ config bsd root on rd0a swap on rd0b and wd0b and sd0b mainbus0 at root bios0 at mainbus0 -apm0 at bios0 +apm0 at bios0 flags 0x0000 # flags 0x0101 to force protocol version 1.1 #option APMDEBUG isa0 at mainbus0 diff --git a/sys/arch/i386/conf/RAMDISKB b/sys/arch/i386/conf/RAMDISKB index 9e6c70158e7..7be0ce29592 100644 --- a/sys/arch/i386/conf/RAMDISKB +++ b/sys/arch/i386/conf/RAMDISKB @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISKB,v 1.14 2000/04/03 21:14:13 deraadt Exp $ +# $OpenBSD: RAMDISKB,v 1.15 2000/06/08 00:16:03 mickey Exp $ # from: OpenBSD: INST,v 1.19 1996/11/05 03:49:13 tholo Exp # # Install kernels no longer support X. @@ -50,7 +50,7 @@ config bsd root on rd0a swap on rd0b and wd0b and sd0b mainbus0 at root bios0 at mainbus0 -apm0 at bios0 +apm0 at bios0 flags 0x0000 # flags 0x0101 to force protocol version 1.1 #option APMDEBUG isa0 at mainbus0 diff --git a/sys/arch/i386/conf/RAMDISK_CD b/sys/arch/i386/conf/RAMDISK_CD index dbd0b5ab8be..5fb3c1dc2bf 100644 --- a/sys/arch/i386/conf/RAMDISK_CD +++ b/sys/arch/i386/conf/RAMDISK_CD @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK_CD,v 1.14 2000/04/03 21:14:13 deraadt Exp $ +# $OpenBSD: RAMDISK_CD,v 1.15 2000/06/08 00:16:03 mickey Exp $ # from: OpenBSD: INST,v 1.19 1996/11/05 03:49:13 tholo Exp # # Install kernels no longer support X. @@ -50,7 +50,7 @@ config bsd root on rd0a swap on rd0b and wd0b and sd0b mainbus0 at root bios0 at mainbus0 -apm0 at bios0 +apm0 at bios0 flags 0x0000 # flags 0x0101 to force protocol version 1.1 #option APMDEBUG isa0 at mainbus0 |