From 87a65718eab6dde871fb4c2487dff56ce1882e50 Mon Sep 17 00:00:00 2001
From: christos <christos@NetBSD.org>
Date: Sat, 30 Mar 1996 22:24:38 +0000
Subject: [PATCH] Eliminate kern_conf.h

---
 sys/kern/kern_descrip.c | 5 ++---
 sys/kern/kern_lkm.c     | 5 ++---
 sys/kern/subr_log.c     | 5 ++---
 sys/kern/tty_pty.c      | 5 ++---
 sys/kern/tty_tty.c      | 4 ++--
 5 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c
index e96f1b394a35..d61da06b1f52 100644
--- a/sys/kern/kern_descrip.c
+++ b/sys/kern/kern_descrip.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_descrip.c,v 1.41 1996/03/29 00:25:30 cgd Exp $	*/
+/*	$NetBSD: kern_descrip.c,v 1.42 1996/03/30 22:24:38 christos Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1989, 1991, 1993
@@ -56,14 +56,13 @@
 #include <sys/syslog.h>
 #include <sys/unistd.h>
 #include <sys/resourcevar.h>
+#include <sys/conf.h>
 
 #include <sys/mount.h>
 #include <sys/syscallargs.h>
 
 #include <vm/vm.h>
 
-#include <kern/kern_conf.h>
-
 /*
  * Descriptor management.
  */
diff --git a/sys/kern/kern_lkm.c b/sys/kern/kern_lkm.c
index 73dd999b4df0..12f33414b28d 100644
--- a/sys/kern/kern_lkm.c
+++ b/sys/kern/kern_lkm.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_lkm.c,v 1.29 1996/03/16 23:17:04 christos Exp $	*/
+/*	$NetBSD: kern_lkm.c,v 1.30 1996/03/30 22:24:42 christos Exp $	*/
 
 /*
  * Copyright (c) 1994 Christopher G. Demetriou
@@ -53,8 +53,7 @@
 #include <sys/mount.h>
 #include <sys/exec.h>
 #include <sys/syscallargs.h>
-
-#include <kern/kern_conf.h>
+#include <sys/conf.h>
 
 #include <sys/lkm.h>
 #include <sys/syscall.h>
diff --git a/sys/kern/subr_log.c b/sys/kern/subr_log.c
index f0ef4a252a4f..415301d269d4 100644
--- a/sys/kern/subr_log.c
+++ b/sys/kern/subr_log.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: subr_log.c,v 1.10 1996/02/09 18:59:58 christos Exp $	*/
+/*	$NetBSD: subr_log.c,v 1.11 1996/03/30 22:24:44 christos Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1993
@@ -48,8 +48,7 @@
 #include <sys/file.h>
 #include <sys/signalvar.h>
 #include <sys/syslog.h>
-
-#include <kern/kern_conf.h>
+#include <sys/conf.h>
 
 #define LOG_RDPRI	(PZERO + 1)
 
diff --git a/sys/kern/tty_pty.c b/sys/kern/tty_pty.c
index d1912abfe222..b6e07d9f5fdb 100644
--- a/sys/kern/tty_pty.c
+++ b/sys/kern/tty_pty.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: tty_pty.c,v 1.32 1996/02/09 19:00:41 christos Exp $	*/
+/*	$NetBSD: tty_pty.c,v 1.33 1996/03/30 22:24:45 christos Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1989, 1993
@@ -52,9 +52,8 @@
 #include <sys/vnode.h>
 #include <sys/signalvar.h>
 #include <sys/uio.h>
+#include <sys/conf.h>
 
-#undef NPTY	/* XXX */
-#include <kern/kern_conf.h>
 
 
 #if NPTY == 1
diff --git a/sys/kern/tty_tty.c b/sys/kern/tty_tty.c
index 4c27f0af47b2..efadf2e3c33d 100644
--- a/sys/kern/tty_tty.c
+++ b/sys/kern/tty_tty.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: tty_tty.c,v 1.12 1996/02/04 02:17:39 christos Exp $	*/
+/*	$NetBSD: tty_tty.c,v 1.13 1996/03/30 22:24:46 christos Exp $	*/
 
 /*-
  * Copyright (c) 1982, 1986, 1991, 1993
@@ -45,8 +45,8 @@
 #include <sys/tty.h>
 #include <sys/vnode.h>
 #include <sys/file.h>
+#include <sys/conf.h>
 
-#include <kern/kern_conf.h>
 
 #define cttyvp(p) ((p)->p_flag & P_CONTROLT ? (p)->p_session->s_ttyvp : NULL)