From 8e7507ada55c969976c6e57592cda6fc73058984 Mon Sep 17 00:00:00 2001
From: downsj <downsj@openbsd.org>
Date: Wed, 5 Feb 1997 17:41:49 +0000
Subject: [PATCH] Make std.hp300 useable for other config files, just don't use
 it in GENERIC ones.

---
 sys/arch/hp300/conf/DISKLESS  | 5 ++---
 sys/arch/hp300/conf/GENERIC   | 5 ++---
 sys/arch/hp300/conf/std.hp300 | 7 +++----
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/sys/arch/hp300/conf/DISKLESS b/sys/arch/hp300/conf/DISKLESS
index 48a3d07f338..d207ee698cd 100644
--- a/sys/arch/hp300/conf/DISKLESS
+++ b/sys/arch/hp300/conf/DISKLESS
@@ -1,11 +1,10 @@
-#	$OpenBSD: DISKLESS,v 1.9 1997/02/03 04:47:05 downsj Exp $
+#	$OpenBSD: DISKLESS,v 1.10 1997/02/05 17:41:49 downsj Exp $
 #	$NetBSD: GENERIC,v 1.23 1997/01/31 06:12:57 thorpej Exp $
 #
 # Generic kernel - one size fits all.
 #
 
-# Include attributes common to all hp300s
-include "arch/hp300/conf/std.hp300"
+machine hp300 m68k
 
 # Include all GENERIC option	
 include "../../../conf/GENERIC"
diff --git a/sys/arch/hp300/conf/GENERIC b/sys/arch/hp300/conf/GENERIC
index 4cffd809a3a..8cde2e841bc 100644
--- a/sys/arch/hp300/conf/GENERIC
+++ b/sys/arch/hp300/conf/GENERIC
@@ -1,11 +1,10 @@
-#	$OpenBSD: GENERIC,v 1.13 1997/02/03 08:11:52 downsj Exp $
+#	$OpenBSD: GENERIC,v 1.14 1997/02/05 17:41:51 downsj Exp $
 #	$NetBSD: GENERIC,v 1.23 1997/01/31 06:12:57 thorpej Exp $
 #
 # Generic kernel - one size fits all.
 #
 
-# Include attributes common to all hp300s
-include "arch/hp300/conf/std.hp300"
+machine hp300 m68k
 
 # Include all GENERIC option	
 include "../../../conf/GENERIC"
diff --git a/sys/arch/hp300/conf/std.hp300 b/sys/arch/hp300/conf/std.hp300
index cacfbba6f57..0009741d301 100644
--- a/sys/arch/hp300/conf/std.hp300
+++ b/sys/arch/hp300/conf/std.hp300
@@ -1,4 +1,4 @@
-#	$OpenBSD: std.hp300,v 1.2 1997/02/03 04:47:09 downsj Exp $
+#	$OpenBSD: std.hp300,v 1.3 1997/02/05 17:41:52 downsj Exp $
 #	$NetBSD: std.hp300,v 1.2 1997/01/30 09:55:45 thorpej Exp $
 #
 # Options/devices that all hp300s should have
@@ -6,6 +6,5 @@
 
 machine hp300 m68k
 
-#option	 	SWAPPAGER	# swap pager (anonymous and swap space)
-#option	 	VNODEPAGER	# vnode pager (mapped files)
-#option	 	DEVPAGER	# device pager (mapped devices)
+option	 	SWAPPAGER	# swap pager (anonymous and swap space)
+option	 	DEVPAGER	# device pager (mapped devices)
-- 
2.20.1