summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorMichael Shalayeff <mickey@cvs.openbsd.org>2001-09-19 20:51:00 +0000
committerMichael Shalayeff <mickey@cvs.openbsd.org>2001-09-19 20:51:00 +0000
commit26751d4f7e73801bb67ab4abe3c6fab6f014d366 (patch)
tree04ee53302fcda940a3ab1ebbec6932ae1bb90ce4 /sys/dev
parent4e3bacfaf6ab9f4eda76a92dac84616ea1d02192 (diff)
merge vm/vm_kern.h into uvm/uvm_extern.h; art@ ok
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/ccd.c4
-rw-r--r--sys/dev/ic/pdqvar.h4
-rw-r--r--sys/dev/ic/sti.c3
-rw-r--r--sys/dev/pci/if_wxvar.h4
-rw-r--r--sys/dev/ramdisk.c4
5 files changed, 8 insertions, 11 deletions
diff --git a/sys/dev/ccd.c b/sys/dev/ccd.c
index beec21881ae..9da3130e65e 100644
--- a/sys/dev/ccd.c
+++ b/sys/dev/ccd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ccd.c,v 1.43 2001/06/27 04:45:56 art Exp $ */
+/* $OpenBSD: ccd.c,v 1.44 2001/09/19 20:50:58 mickey Exp $ */
/* $NetBSD: ccd.c,v 1.33 1996/05/05 04:21:14 thorpej Exp $ */
/*-
@@ -117,8 +117,6 @@
#include <dev/ccdvar.h>
#include <vm/vm.h>
-#include <vm/vm_kern.h>
-
#include <uvm/uvm_extern.h>
#ifdef __GNUC__
diff --git a/sys/dev/ic/pdqvar.h b/sys/dev/ic/pdqvar.h
index fe47ff1ee20..2286f72e86a 100644
--- a/sys/dev/ic/pdqvar.h
+++ b/sys/dev/ic/pdqvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pdqvar.h,v 1.12 2001/06/27 04:45:58 art Exp $ */
+/* $OpenBSD: pdqvar.h,v 1.13 2001/09/19 20:50:58 mickey Exp $ */
/* $NetBSD: pdqvar.h,v 1.11 1996/10/25 21:33:37 cgd Exp $ */
/*-
@@ -71,7 +71,7 @@ enum _pdq_type_t {
#endif /* M_CAST */
#include <sys/malloc.h>
#include <vm/vm.h>
-#include <vm/vm_kern.h>
+#include <uvm/uvm_extern.h>
#define PDQ_USE_MBUFS
#if defined(__NetBSD__) || defined(__OpenBSD__)
diff --git a/sys/dev/ic/sti.c b/sys/dev/ic/sti.c
index c7321d4392b..49d771c4b87 100644
--- a/sys/dev/ic/sti.c
+++ b/sys/dev/ic/sti.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sti.c,v 1.5 2001/03/20 08:32:20 mickey Exp $ */
+/* $OpenBSD: sti.c,v 1.6 2001/09/19 20:50:58 mickey Exp $ */
/*
* Copyright (c) 2000-2001 Michael Shalayeff
@@ -43,7 +43,6 @@
#include <sys/malloc.h>
#include <vm/vm.h>
-#include <vm/vm_kern.h>
#include <uvm/uvm.h>
#include <machine/bus.h>
diff --git a/sys/dev/pci/if_wxvar.h b/sys/dev/pci/if_wxvar.h
index c0b3a7f83d4..b73861466ee 100644
--- a/sys/dev/pci/if_wxvar.h
+++ b/sys/dev/pci/if_wxvar.h
@@ -279,9 +279,11 @@ struct wxmdvar {
#endif
#include <vm/vm.h>
-#include <vm/vm_kern.h>
+#include <uvm/uvm_extern.h>
+
#include <machine/bus.h>
#include <machine/intr.h>
+
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
#include <dev/pci/pcidevs.h>
diff --git a/sys/dev/ramdisk.c b/sys/dev/ramdisk.c
index 5b281c0e2db..663718d9c9a 100644
--- a/sys/dev/ramdisk.c
+++ b/sys/dev/ramdisk.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ramdisk.c,v 1.14 2001/07/08 05:43:16 millert Exp $ */
+/* $OpenBSD: ramdisk.c,v 1.15 2001/09/19 20:50:58 mickey Exp $ */
/* $NetBSD: ramdisk.c,v 1.8 1996/04/12 08:30:09 leo Exp $ */
/*
@@ -60,8 +60,6 @@
#include <sys/dkio.h>
#include <vm/vm.h>
-#include <vm/vm_kern.h>
-
#include <uvm/uvm_extern.h>
#include <dev/ramdisk.h>