summaryrefslogtreecommitdiff
path: root/sys/arch/i386
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2005-04-30 00:49:38 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2005-04-30 00:49:38 +0000
commit45b47fa150ac72b9865630dd0206645114ea827c (patch)
tree9da78aededf282049c612302a07c92f49c4edd39 /sys/arch/i386
parentb39e83aa064f336f7d090fd1f77fbca8510f04ae (diff)
start the job of making things look more alike
Diffstat (limited to 'sys/arch/i386')
-rw-r--r--sys/arch/i386/conf/GENERIC10
1 files changed, 4 insertions, 6 deletions
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index e0ca63656fc..95bca1bd31d 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.408 2005/04/30 00:36:04 deraadt Exp $
+# $OpenBSD: GENERIC,v 1.409 2005/04/30 00:49:36 deraadt Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -9,9 +9,9 @@
# of each device driver in this file see the section 4 man page for the
# device.
-machine i386 # architecture, used by config; REQUIRED
-
-include "../../../conf/GENERIC"
+machine i386
+include "../../../conf/GENERIC"
+maxusers 32 # estimated number of users
option I386_CPU # CPU classes; at least one is REQUIRED
option I486_CPU
@@ -39,8 +39,6 @@ option COMPAT_AOUT # a.out binaries are emulated
#option NTFS # Experimental NTFS support
-maxusers 32 # estimated number of users
-
# or use root on nfs swap on nfs
config bsd swap generic