summaryrefslogtreecommitdiff
path: root/sys/arch/amd64
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/amd64
parentb39e83aa064f336f7d090fd1f77fbca8510f04ae (diff)
start the job of making things look more alike
Diffstat (limited to 'sys/arch/amd64')
-rw-r--r--sys/arch/amd64/conf/GENERIC10
1 files changed, 4 insertions, 6 deletions
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index 8b81472f0ff..ebafba39564 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.61 2005/04/30 00:36:03 deraadt Exp $
+# $OpenBSD: GENERIC,v 1.62 2005/04/30 00:49:35 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 amd64 # architecture, used by config; REQUIRED
-
-include "../../../conf/GENERIC"
+machine amd64
+include "../../../conf/GENERIC"
+maxusers 32 # estimated number of users
#option USER_PCICONF # user-space PCI configuration
@@ -32,8 +32,6 @@ option APERTURE # in-kernel aperture driver for XFree86
#option NTFS # Experimental NTFS support
-maxusers 32 # estimated number of users
-
config bsd swap generic
mainbus0 at root