From 0310c19f5d0c65dda76b09b3b2940f7c5ad5fd99 Mon Sep 17 00:00:00 2001
From: Bruce Evans <bde@FreeBSD.org>
Date: Wed, 6 Dec 1995 23:52:35 +0000
Subject: Replaced #includes of <sys/user.h> by less gross headers, usually
 <sys/vm.h>.  Many device drivers need only the definition of vtophys() from
 vm.

Added nearby #includes of <sys/conf.h> where appropriate.
---
 sys/dev/dgb/dgb.c         | 5 +++--
 sys/dev/si/si.c           | 5 +++--
 sys/dev/syscons/syscons.c | 6 ++++--
 3 files changed, 10 insertions(+), 6 deletions(-)

(limited to 'sys/dev')

diff --git a/sys/dev/dgb/dgb.c b/sys/dev/dgb/dgb.c
index b6e70796d38fb..fb46e283f264d 100644
--- a/sys/dev/dgb/dgb.c
+++ b/sys/dev/dgb/dgb.c
@@ -1,5 +1,5 @@
 /*-
- *  dgb.c $Id: dgb.c,v 1.6 1995/11/29 10:47:03 julian Exp $
+ *  dgb.c $Id: dgb.c,v 1.7 1995/11/29 14:39:06 julian Exp $
  *
  *  Digiboard driver.
  *
@@ -32,7 +32,6 @@
 #include <sys/ioctl.h>
 #include <sys/tty.h>
 #include <sys/proc.h>
-#include <sys/user.h>
 #include <sys/conf.h>
 #include <sys/dkstat.h>
 #include <sys/file.h>
@@ -44,6 +43,8 @@
 
 #include <machine/clock.h>
 
+#include <vm/vm.h>
+
 #include <i386/isa/isa.h>
 #include <i386/isa/isa_device.h>
 
diff --git a/sys/dev/si/si.c b/sys/dev/si/si.c
index 386690cefa2c8..5e352450aee5b 100644
--- a/sys/dev/si/si.c
+++ b/sys/dev/si/si.c
@@ -30,7 +30,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
  * NO EVENT SHALL THE AUTHORS BE LIABLE.
  *
- *	$Id: si.c,v 1.19 1995/11/29 14:39:55 julian Exp $
+ *	$Id: si.c,v 1.20 1995/12/04 17:33:45 peter Exp $
  */
 
 #ifndef lint
@@ -45,7 +45,6 @@ static char si_copyright1[] =  "@(#) (C) Specialix International, 1990,1992",
 #include <sys/tty.h>
 #include <sys/ttydefaults.h>
 #include <sys/proc.h>
-#include <sys/user.h>
 #include <sys/conf.h>
 #include <sys/file.h>
 #include <sys/uio.h>
@@ -57,6 +56,8 @@ static char si_copyright1[] =  "@(#) (C) Specialix International, 1990,1992",
 
 #include <machine/clock.h>
 
+#include <vm/vm.h>
+
 #include <i386/isa/icu.h>
 #include <i386/isa/isa.h>
 #include <i386/isa/isa_device.h>
diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c
index f8b2d8c1f9794..a1c2796de1616 100644
--- a/sys/dev/syscons/syscons.c
+++ b/sys/dev/syscons/syscons.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: syscons.c,v 1.131 1995/11/28 00:17:30 ache Exp $
+ *  $Id: syscons.c,v 1.132 1995/11/30 03:29:31 ache Exp $
  */
 
 #include "sc.h"
@@ -36,7 +36,7 @@
 #include <sys/conf.h>
 #include <sys/ioctl.h>
 #include <sys/proc.h>
-#include <sys/user.h>
+#include <sys/signalvar.h>
 #include <sys/tty.h>
 #include <sys/uio.h>
 #include <sys/callout.h>
@@ -55,6 +55,8 @@
 #include <machine/apm_bios.h>
 #include <machine/random.h>
 
+#include <vm/vm.h>
+
 #include <i386/isa/isa.h>
 #include <i386/isa/isa_device.h>
 #include <i386/isa/timerreg.h>
-- 
cgit v1.3