diff options
author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1996-10-30 22:41:57 +0000 |
---|---|---|
committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1996-10-30 22:41:57 +0000 |
commit | 072b56c97e17e8e69ddab5a735b5297387a88a70 (patch) | |
tree | 22eaee09956502609c240ddff8a108d8733521f9 /sys/arch/alpha/conf/BUNNY | |
parent | b85b15782739220b5bf2563ccdc7ac9e256a31d2 (diff) |
Merge to NetBSD 961020. Retained our kernel APIs where NetBSD has changed.
-Wall -Wstrict-prototypes -Wmissing-prototypes too.
Diffstat (limited to 'sys/arch/alpha/conf/BUNNY')
-rw-r--r-- | sys/arch/alpha/conf/BUNNY | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sys/arch/alpha/conf/BUNNY b/sys/arch/alpha/conf/BUNNY index 88803eec57e..1ba7650e2ee 100644 --- a/sys/arch/alpha/conf/BUNNY +++ b/sys/arch/alpha/conf/BUNNY @@ -1,12 +1,12 @@ -# $OpenBSD: BUNNY,v 1.6 1996/09/20 06:44:50 deraadt Exp $ -# $NetBSD: BUNNY,v 1.5.4.1 1996/06/13 19:22:03 cgd Exp $ +# $OpenBSD: BUNNY,v 1.7 1996/10/30 22:38:38 niklas Exp $ +# $NetBSD: BUNNY,v 1.9 1996/09/27 17:08:35 cgd Exp $ # # Kernel for bunnahabhain.pdl.cs.cmu.edu. # # Trimmed down kernel for AlphaStation [24]xx systems, with lots # of buffer cache. -include "std.alpha" +include "arch/alpha/conf/std.alpha" maxusers 8 @@ -42,6 +42,7 @@ options COMPAT_43 #options COMPAT_09 options COMPAT_10 options COMPAT_11 +options COMPAT_12 # Loadable Kernel Modules options LKM @@ -50,7 +51,8 @@ options LKM #options INSECURE # Misc. options -options PCIVERBOSE # recognize "unknown" PCI devices +options PCIVERBOSE # recognize "unknown" PCI devices +options UCONSOLE # users can use TIOCCONS (for xconsole) config bsd swap generic |