From 2d29d17da32ea75201747c477fad9f91ceae7b5d Mon Sep 17 00:00:00 2001
From: christos <christos@NetBSD.org>
Date: Sat, 30 Mar 1996 21:13:53 +0000
Subject: [PATCH] Deprecate use of *_conf.h and use only <machine/conf.h> and
 <sys/conf.h>

---
 sys/arch/sparc/sparc/conf.c | 33 +++++++++++++++++++++++++--------
 1 file changed, 25 insertions(+), 8 deletions(-)

diff --git a/sys/arch/sparc/sparc/conf.c b/sys/arch/sparc/sparc/conf.c
index b91ac949de02..05cd6aee83ad 100644
--- a/sys/arch/sparc/sparc/conf.c
+++ b/sys/arch/sparc/sparc/conf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: conf.c,v 1.38 1996/03/14 21:09:00 christos Exp $ */
+/*	$NetBSD: conf.c,v 1.39 1996/03/30 21:13:53 christos Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -50,14 +50,31 @@
 #include <sys/ioctl.h>
 #include <sys/vnode.h>
 #include <sys/tty.h>
+#include <sys/conf.h>
 
-#include <scsi/scsi_conf.h>
-#include <kern/kern_conf.h>
-#include <dev/dev_conf.h>
-#include <net/net_conf.h>
-#include <sparc/dev/dev_conf.h>
-#include <sparc/sparc/sparc_conf.h>
-#include <compat/svr4/svr4_conf.h>
+#include <machine/conf.h>
+
+#include "pty.h"
+#include "bpfilter.h"
+#include "tun.h"
+#include "audio.h"
+#include "vnd.h"
+#include "ccd.h"
+#include "ch.h"
+#include "ss.h"
+#include "sd.h"
+#include "st.h"
+#include "cd.h"
+
+#include "zs.h"
+#include "fd.h"
+#include "bwtwo.h"
+#include "cgthree.h"
+#include "cgfour.h"
+#include "cgsix.h"
+#include "cgeight.h"
+#include "xd.h"
+#include "xy.h"
 
 struct bdevsw	bdevsw[] =
 {