summaryrefslogtreecommitdiff
path: root/sys/arch/sparc
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/sparc
parentb39e83aa064f336f7d090fd1f77fbca8510f04ae (diff)
start the job of making things look more alike
Diffstat (limited to 'sys/arch/sparc')
-rw-r--r--sys/arch/sparc/conf/GENERIC10
1 files changed, 3 insertions, 7 deletions
diff --git a/sys/arch/sparc/conf/GENERIC b/sys/arch/sparc/conf/GENERIC
index 40c4960bcdf..bad6c5112ec 100644
--- a/sys/arch/sparc/conf/GENERIC
+++ b/sys/arch/sparc/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.81 2005/04/30 00:36:05 deraadt Exp $
+# $OpenBSD: GENERIC,v 1.82 2005/04/30 00:49:36 deraadt Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -9,11 +9,9 @@
# of each device driver in this file see the section 4 man page for the
# device.
-# Machine architecture; required by config(8)
machine sparc
-
-include "../../../conf/GENERIC"
-
+include "../../../conf/GENERIC"
+maxusers 20 # estimated number of users
# Options for variants of the Sun SPARC architecture.
# At least one is required.
@@ -31,8 +29,6 @@ option SUN4M # sun4m - SS10, SS20, Classic, etc.
option COMPAT_SUNOS # compatibility with SunOS binaries
option COMPAT_SVR4 # compatibility with SVR4 binaries
-maxusers 20 # estimated number of users
-
# Generic swap; second partition of root disk or network.
config bsd swap generic