summaryrefslogtreecommitdiff
path: root/sys/arch/hppa/conf/GENERIC
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/hppa/conf/GENERIC
parentb39e83aa064f336f7d090fd1f77fbca8510f04ae (diff)
start the job of making things look more alike
Diffstat (limited to 'sys/arch/hppa/conf/GENERIC')
-rw-r--r--sys/arch/hppa/conf/GENERIC10
1 files changed, 3 insertions, 7 deletions
diff --git a/sys/arch/hppa/conf/GENERIC b/sys/arch/hppa/conf/GENERIC
index de477e063cc..fb5b6d1f89e 100644
--- a/sys/arch/hppa/conf/GENERIC
+++ b/sys/arch/hppa/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.69 2005/04/30 00:36:04 deraadt Exp $
+# $OpenBSD: GENERIC,v 1.70 2005/04/30 00:49:36 deraadt Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -9,10 +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 hppa
-
-include "../../../conf/GENERIC"
+include "../../../conf/GENERIC"
+maxusers 32 # estimated number of users
# Support for various CPU types
option HP7000_CPU # PCXS
@@ -32,9 +31,6 @@ option USER_PCICONF # user-space PCI configuration
option COMPAT_HPUX
#option COMPAT_LINUX
-# Need to set locally
-maxusers 32
-
option TIMEZONE=0 # time zone to adjust RTC time by
option DST=0 # daylight saving time used by RTC