From c5cd2c8f2675686cf0a1890b7d68ddbd8fc0d6fa Mon Sep 17 00:00:00 2001
From: christos <christos@NetBSD.org>
Date: Sat, 30 Mar 1996 22:40:55 +0000
Subject: [PATCH] Remove dependence on svr4_conf.h and the file itself.

---
 sys/compat/svr4/svr4_conf.h | 40 -------------------------------------
 sys/compat/svr4/svr4_net.c  |  4 ++--
 2 files changed, 2 insertions(+), 42 deletions(-)
 delete mode 100644 sys/compat/svr4/svr4_conf.h

diff --git a/sys/compat/svr4/svr4_conf.h b/sys/compat/svr4/svr4_conf.h
deleted file mode 100644
index 975aca1fddca..000000000000
--- a/sys/compat/svr4/svr4_conf.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*	$NetBSD: svr4_conf.h,v 1.1 1996/03/14 19:29:11 christos Exp $	*/
-
-/*
- * Copyright (c) 1995 Christos Zoulas.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by Christos Zoulas.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/conf.h>
-
-#ifdef COMPAT_SVR4
-# define NSVR4_NET	1
-#else
-# define NSVR4_NET	0
-#endif
-
-cdev_decl(svr4_net);
diff --git a/sys/compat/svr4/svr4_net.c b/sys/compat/svr4/svr4_net.c
index 259d3606b435..b0fed33c0db5 100644
--- a/sys/compat/svr4/svr4_net.c
+++ b/sys/compat/svr4/svr4_net.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: svr4_net.c,v 1.7 1996/03/14 19:29:13 christos Exp $	 */
+/*	$NetBSD: svr4_net.c,v 1.8 1996/03/30 22:41:02 christos Exp $	 */
 
 /*
  * Copyright (c) 1994 Christos Zoulas
@@ -48,6 +48,7 @@
 #include <sys/proc.h>
 #include <sys/vnode.h>
 #include <sys/device.h>
+#include <sys/conf.h>
 
 
 #include <compat/svr4/svr4_types.h>
@@ -56,7 +57,6 @@
 #include <compat/svr4/svr4_syscallargs.h>
 #include <compat/svr4/svr4_ioctl.h>
 #include <compat/svr4/svr4_stropts.h>
-#include <compat/svr4/svr4_conf.h>
 
 /*
  * Device minor numbers