summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
authorJason Wright <jason@cvs.openbsd.org>2006-06-21 19:28:09 +0000
committerJason Wright <jason@cvs.openbsd.org>2006-06-21 19:28:09 +0000
commit94e78363a1249e6d79ecf63bd2d9540c1e7cf429 (patch)
tree0810c542572108fd9f8be39c389c809117d41ea7 /sys/arch
parent5b634e84cdb0ff94cd3e1484eb9fbba54cc7a835 (diff)
Don't need option SUN4U. It's not -really- an option on sparc64, duh.
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/sparc64/conf/GENERIC4
-rw-r--r--sys/arch/sparc64/conf/RAMDISK4
-rw-r--r--sys/arch/sparc64/conf/RAMDISKU14
-rw-r--r--sys/arch/sparc64/conf/RAMDISKU54
4 files changed, 4 insertions, 12 deletions
diff --git a/sys/arch/sparc64/conf/GENERIC b/sys/arch/sparc64/conf/GENERIC
index 1f4552d9976..800852de549 100644
--- a/sys/arch/sparc64/conf/GENERIC
+++ b/sys/arch/sparc64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.147 2006/06/18 12:07:18 naddy Exp $
+# $OpenBSD: GENERIC,v 1.148 2006/06/21 19:28:08 jason Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -13,8 +13,6 @@ machine sparc64
include "../../../conf/GENERIC"
maxusers 64 # estimated number of users
-option SUN4U
-
option PCIVERBOSE
option USER_PCICONF # user-space PCI configuration
option APERTURE
diff --git a/sys/arch/sparc64/conf/RAMDISK b/sys/arch/sparc64/conf/RAMDISK
index 03deb44bb87..c0543200969 100644
--- a/sys/arch/sparc64/conf/RAMDISK
+++ b/sys/arch/sparc64/conf/RAMDISK
@@ -1,10 +1,8 @@
-# $OpenBSD: RAMDISK,v 1.50 2005/11/15 01:12:49 brad Exp $
+# $OpenBSD: RAMDISK,v 1.51 2006/06/21 19:28:08 jason Exp $
# Machine architecture; required by config(8)
machine sparc64
-option SUN4U
-
# maxusers means mostly "let's get small" in terms of kernel malloc's
maxusers 2
diff --git a/sys/arch/sparc64/conf/RAMDISKU1 b/sys/arch/sparc64/conf/RAMDISKU1
index fd6bf335f8b..70a7be050af 100644
--- a/sys/arch/sparc64/conf/RAMDISKU1
+++ b/sys/arch/sparc64/conf/RAMDISKU1
@@ -1,10 +1,8 @@
-# $OpenBSD: RAMDISKU1,v 1.15 2005/05/01 07:54:43 david Exp $
+# $OpenBSD: RAMDISKU1,v 1.16 2006/06/21 19:28:08 jason Exp $
# Machine architecture; required by config(8)
machine sparc64
-option SUN4U
-
# maxusers means mostly "let's get small" in terms of kernel malloc's
maxusers 2
diff --git a/sys/arch/sparc64/conf/RAMDISKU5 b/sys/arch/sparc64/conf/RAMDISKU5
index 408c54a16d7..6d1d7049866 100644
--- a/sys/arch/sparc64/conf/RAMDISKU5
+++ b/sys/arch/sparc64/conf/RAMDISKU5
@@ -1,10 +1,8 @@
-# $OpenBSD: RAMDISKU5,v 1.10 2005/08/09 16:48:11 deraadt Exp $
+# $OpenBSD: RAMDISKU5,v 1.11 2006/06/21 19:28:08 jason Exp $
# Machine architecture; required by config(8)
machine sparc64
-option SUN4U
-
# maxusers means mostly "let's get small" in terms of kernel malloc's
maxusers 2