summaryrefslogtreecommitdiff
path: root/sys/dev/pci
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev/pci')
-rw-r--r--sys/dev/pci/hifn7751.c8
-rw-r--r--sys/dev/pci/if_dc_pci.c3
-rw-r--r--sys/dev/pci/if_nge.c4
-rw-r--r--sys/dev/pci/if_rl_pci.c4
-rw-r--r--sys/dev/pci/if_sf.c3
-rw-r--r--sys/dev/pci/if_sis.c3
-rw-r--r--sys/dev/pci/if_sk.c4
-rw-r--r--sys/dev/pci/if_ste.c3
-rw-r--r--sys/dev/pci/if_ti.c4
-rw-r--r--sys/dev/pci/if_tl.c3
-rw-r--r--sys/dev/pci/if_tx.c3
-rw-r--r--sys/dev/pci/if_txp.c4
-rw-r--r--sys/dev/pci/if_vr.c3
-rw-r--r--sys/dev/pci/if_wb.c4
-rw-r--r--sys/dev/pci/if_wxvar.h1
-rw-r--r--sys/dev/pci/if_xl_pci.c3
-rw-r--r--sys/dev/pci/lofn.c8
-rw-r--r--sys/dev/pci/ncr.c5
-rw-r--r--sys/dev/pci/ubsec.c8
19 files changed, 25 insertions, 53 deletions
diff --git a/sys/dev/pci/hifn7751.c b/sys/dev/pci/hifn7751.c
index 4d9709650ff..2602d9fa76c 100644
--- a/sys/dev/pci/hifn7751.c
+++ b/sys/dev/pci/hifn7751.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hifn7751.c,v 1.91 2001/08/11 06:40:35 jason Exp $ */
+/* $OpenBSD: hifn7751.c,v 1.92 2001/08/12 20:03:48 mickey Exp $ */
/*
* Invertex AEON / Hifn 7751 driver
@@ -46,12 +46,10 @@
#include <sys/malloc.h>
#include <sys/kernel.h>
#include <sys/mbuf.h>
-#include <vm/vm.h>
-#include <vm/vm_extern.h>
-#include <vm/pmap.h>
-#include <machine/pmap.h>
#include <sys/device.h>
+#include <vm/vm.h>
+
#include <crypto/cryptodev.h>
#include <dev/rndvar.h>
diff --git a/sys/dev/pci/if_dc_pci.c b/sys/dev/pci/if_dc_pci.c
index 4650d726aed..30e0838fe95 100644
--- a/sys/dev/pci/if_dc_pci.c
+++ b/sys/dev/pci/if_dc_pci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_dc_pci.c,v 1.13 2001/04/06 17:14:14 aaron Exp $ */
+/* $OpenBSD: if_dc_pci.c,v 1.14 2001/08/12 20:03:49 mickey Exp $ */
/*
* Copyright (c) 1997, 1998, 1999
@@ -66,7 +66,6 @@
#endif
#include <vm/vm.h> /* for vtophys */
-#include <vm/pmap.h> /* for vtophys */
#include <dev/mii/mii.h>
#include <dev/mii/miivar.h>
diff --git a/sys/dev/pci/if_nge.c b/sys/dev/pci/if_nge.c
index e3c5c89e976..95a44b8bdc5 100644
--- a/sys/dev/pci/if_nge.c
+++ b/sys/dev/pci/if_nge.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_nge.c,v 1.6 2001/07/06 06:18:43 angelos Exp $ */
+/* $OpenBSD: if_nge.c,v 1.7 2001/08/12 20:03:49 mickey Exp $ */
/*
* Copyright (c) 2001 Wind River Systems
* Copyright (c) 1997, 1998, 1999, 2000, 2001
@@ -109,9 +109,7 @@
#endif
#include <vm/vm.h> /* for vtophys */
-#include <vm/pmap.h> /* for vtophys */
#include <vm/vm_kern.h>
-#include <vm/vm_extern.h>
#define NGE_USEIOSPACE
diff --git a/sys/dev/pci/if_rl_pci.c b/sys/dev/pci/if_rl_pci.c
index 74e0295dc25..047ad8ee906 100644
--- a/sys/dev/pci/if_rl_pci.c
+++ b/sys/dev/pci/if_rl_pci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_rl_pci.c,v 1.2 2001/04/13 15:58:44 aaron Exp $ */
+/* $OpenBSD: if_rl_pci.c,v 1.3 2001/08/12 20:03:49 mickey Exp $ */
/*
* Copyright (c) 1997, 1998
@@ -63,9 +63,7 @@
#endif
#include <vm/vm.h> /* for vtophys */
-#include <vm/pmap.h> /* for vtophys */
#include <vm/vm_kern.h>
-#include <vm/vm_extern.h>
#include <machine/bus.h>
#include <dev/mii/mii.h>
diff --git a/sys/dev/pci/if_sf.c b/sys/dev/pci/if_sf.c
index 84f586a58a5..f1096c54898 100644
--- a/sys/dev/pci/if_sf.c
+++ b/sys/dev/pci/if_sf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_sf.c,v 1.12 2001/06/27 06:34:48 kjc Exp $ */
+/* $OpenBSD: if_sf.c,v 1.13 2001/08/12 20:03:49 mickey Exp $ */
/*
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
@@ -110,7 +110,6 @@
#endif
#include <vm/vm.h> /* for vtophys */
-#include <vm/pmap.h> /* for vtophys */
#include <sys/device.h>
diff --git a/sys/dev/pci/if_sis.c b/sys/dev/pci/if_sis.c
index e012dd17ea3..edc61509a37 100644
--- a/sys/dev/pci/if_sis.c
+++ b/sys/dev/pci/if_sis.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_sis.c,v 1.15 2001/06/27 06:34:48 kjc Exp $ */
+/* $OpenBSD: if_sis.c,v 1.16 2001/08/12 20:03:49 mickey Exp $ */
/*
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
@@ -90,7 +90,6 @@
#endif
#include <vm/vm.h> /* for vtophys */
-#include <vm/pmap.h> /* for vtophys */
#include <sys/device.h>
diff --git a/sys/dev/pci/if_sk.c b/sys/dev/pci/if_sk.c
index 9c27992fc6a..5db1428ba32 100644
--- a/sys/dev/pci/if_sk.c
+++ b/sys/dev/pci/if_sk.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_sk.c,v 1.13 2001/06/25 02:18:47 fgsch Exp $ */
+/* $OpenBSD: if_sk.c,v 1.14 2001/08/12 20:03:49 mickey Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000
@@ -101,9 +101,7 @@
#endif
#include <vm/vm.h> /* for vtophys */
-#include <vm/pmap.h> /* for vtophys */
#include <vm/vm_kern.h>
-#include <vm/vm_extern.h>
#include <machine/bus.h>
#include <dev/mii/mii.h>
diff --git a/sys/dev/pci/if_ste.c b/sys/dev/pci/if_ste.c
index 8dd665c8936..b3041206c93 100644
--- a/sys/dev/pci/if_ste.c
+++ b/sys/dev/pci/if_ste.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_ste.c,v 1.12 2001/06/27 06:34:49 kjc Exp $ */
+/* $OpenBSD: if_ste.c,v 1.13 2001/08/12 20:03:49 mickey Exp $ */
/*
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
@@ -65,7 +65,6 @@
#endif
#include <vm/vm.h> /* for vtophys */
-#include <vm/pmap.h> /* for vtophys */
#include <sys/device.h>
diff --git a/sys/dev/pci/if_ti.c b/sys/dev/pci/if_ti.c
index 5a99a95d4ba..fc33591e112 100644
--- a/sys/dev/pci/if_ti.c
+++ b/sys/dev/pci/if_ti.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_ti.c,v 1.27 2001/07/03 03:32:11 jason Exp $ */
+/* $OpenBSD: if_ti.c,v 1.28 2001/08/12 20:03:49 mickey Exp $ */
/*
* Copyright (c) 1997, 1998, 1999
@@ -111,9 +111,7 @@
#endif
#include <vm/vm.h> /* for vtophys */
-#include <vm/pmap.h> /* for vtophys */
#include <vm/vm_kern.h>
-#include <vm/vm_extern.h>
#include <machine/bus.h>
#include <dev/pci/pcireg.h>
diff --git a/sys/dev/pci/if_tl.c b/sys/dev/pci/if_tl.c
index 60d970d3bc0..2535b6992b5 100644
--- a/sys/dev/pci/if_tl.c
+++ b/sys/dev/pci/if_tl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_tl.c,v 1.21 2001/06/27 06:34:49 kjc Exp $ */
+/* $OpenBSD: if_tl.c,v 1.22 2001/08/12 20:03:49 mickey Exp $ */
/*
* Copyright (c) 1997, 1998
@@ -210,7 +210,6 @@
#endif
#include <vm/vm.h> /* for vtophys */
-#include <vm/pmap.h> /* for vtophys */
#include <dev/mii/mii.h>
#include <dev/mii/miivar.h>
diff --git a/sys/dev/pci/if_tx.c b/sys/dev/pci/if_tx.c
index 9c4abd38f72..5d048d72491 100644
--- a/sys/dev/pci/if_tx.c
+++ b/sys/dev/pci/if_tx.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_tx.c,v 1.17 2001/06/27 06:34:50 kjc Exp $ */
+/* $OpenBSD: if_tx.c,v 1.18 2001/08/12 20:03:49 mickey Exp $ */
/* $FreeBSD: src/sys/pci/if_tx.c,v 1.45 2001/02/07 20:11:02 semenu Exp $ */
/*-
@@ -116,7 +116,6 @@
#endif
#include <vm/vm.h>
-#include <vm/pmap.h>
#include <dev/mii/mii.h>
#include <dev/mii/miivar.h>
diff --git a/sys/dev/pci/if_txp.c b/sys/dev/pci/if_txp.c
index 6e6dcd6f79d..3237ddab9f3 100644
--- a/sys/dev/pci/if_txp.c
+++ b/sys/dev/pci/if_txp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_txp.c,v 1.49 2001/08/10 15:58:49 jason Exp $ */
+/* $OpenBSD: if_txp.c,v 1.50 2001/08/12 20:03:49 mickey Exp $ */
/*
* Copyright (c) 2001
@@ -74,9 +74,7 @@
#endif
#include <vm/vm.h> /* for vtophys */
-#include <vm/pmap.h> /* for vtophys */
#include <vm/vm_kern.h>
-#include <vm/vm_extern.h>
#include <machine/bus.h>
#include <dev/mii/mii.h>
diff --git a/sys/dev/pci/if_vr.c b/sys/dev/pci/if_vr.c
index 1c720aa7748..ca7256b7689 100644
--- a/sys/dev/pci/if_vr.c
+++ b/sys/dev/pci/if_vr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_vr.c,v 1.18 2001/06/27 06:34:50 kjc Exp $ */
+/* $OpenBSD: if_vr.c,v 1.19 2001/08/12 20:03:49 mickey Exp $ */
/*
* Copyright (c) 1997, 1998
@@ -88,7 +88,6 @@
#endif
#include <vm/vm.h> /* for vtophys */
-#include <vm/pmap.h> /* for vtophys */
#include <dev/mii/mii.h>
#include <dev/mii/miivar.h>
diff --git a/sys/dev/pci/if_wb.c b/sys/dev/pci/if_wb.c
index e324c0abfc7..ec3a5c31813 100644
--- a/sys/dev/pci/if_wb.c
+++ b/sys/dev/pci/if_wb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_wb.c,v 1.11 2001/06/27 06:34:50 kjc Exp $ */
+/* $OpenBSD: if_wb.c,v 1.12 2001/08/12 20:03:49 mickey Exp $ */
/*
* Copyright (c) 1997, 1998
@@ -117,9 +117,7 @@
#endif
#include <vm/vm.h> /* for vtophys */
-#include <vm/pmap.h> /* for vtophys */
#include <vm/vm_kern.h>
-#include <vm/vm_extern.h>
#include <dev/mii/mii.h>
#include <dev/mii/miivar.h>
diff --git a/sys/dev/pci/if_wxvar.h b/sys/dev/pci/if_wxvar.h
index d7a25105a86..f309cfbd0c0 100644
--- a/sys/dev/pci/if_wxvar.h
+++ b/sys/dev/pci/if_wxvar.h
@@ -169,7 +169,6 @@ typedef unsigned long intptr_t;
#include <net/ethernet.h>
#include <net/if_arp.h>
#include <vm/vm.h>
-#include <vm/pmap.h>
#include <machine/clock.h>
#include <pci/pcivar.h>
#include <pci/pcireg.h>
diff --git a/sys/dev/pci/if_xl_pci.c b/sys/dev/pci/if_xl_pci.c
index bd6b14fe87e..e9905a0bb07 100644
--- a/sys/dev/pci/if_xl_pci.c
+++ b/sys/dev/pci/if_xl_pci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_xl_pci.c,v 1.7 2000/10/14 15:44:21 aaron Exp $ */
+/* $OpenBSD: if_xl_pci.c,v 1.8 2001/08/12 20:03:49 mickey Exp $ */
/*
* Copyright (c) 1997, 1998, 1999
@@ -72,7 +72,6 @@
#endif
#include <vm/vm.h> /* for vtophys */
-#include <vm/pmap.h> /* for vtophys */
/*
* The following #define causes the code to use PIO to access the
diff --git a/sys/dev/pci/lofn.c b/sys/dev/pci/lofn.c
index d02a77fc554..83c675752ca 100644
--- a/sys/dev/pci/lofn.c
+++ b/sys/dev/pci/lofn.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lofn.c,v 1.8 2001/07/08 18:05:43 brad Exp $ */
+/* $OpenBSD: lofn.c,v 1.9 2001/08/12 20:03:49 mickey Exp $ */
/*
* Copyright (c) 2001 Jason L. Wright (jason@thought.net)
@@ -42,12 +42,10 @@
#include <sys/malloc.h>
#include <sys/kernel.h>
#include <sys/mbuf.h>
-#include <vm/vm.h>
-#include <vm/vm_extern.h>
-#include <vm/pmap.h>
-#include <machine/pmap.h>
#include <sys/device.h>
+#include <vm/vm.h>
+
#include <crypto/cryptodev.h>
#include <dev/rndvar.h>
diff --git a/sys/dev/pci/ncr.c b/sys/dev/pci/ncr.c
index 8a0f3d2ed6c..61f7f668160 100644
--- a/sys/dev/pci/ncr.c
+++ b/sys/dev/pci/ncr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ncr.c,v 1.57 2001/06/12 15:40:32 niklas Exp $ */
+/* $OpenBSD: ncr.c,v 1.58 2001/08/12 20:03:49 mickey Exp $ */
/* $NetBSD: ncr.c,v 1.63 1997/09/23 02:39:15 perry Exp $ */
/**************************************************************************
@@ -224,7 +224,6 @@
#include <machine/clock.h>
#endif
#include <vm/vm.h>
-#include <vm/pmap.h>
#include <vm/vm_extern.h>
#endif /* KERNEL */
@@ -1464,7 +1463,7 @@ static void ncr_attach (pcici_t tag, int unit);
#if 0
static char ident[] =
- "\n$OpenBSD: ncr.c,v 1.57 2001/06/12 15:40:32 niklas Exp $\n";
+ "\n$OpenBSD: ncr.c,v 1.58 2001/08/12 20:03:49 mickey Exp $\n";
#endif
static const u_long ncr_version = NCR_VERSION * 11
diff --git a/sys/dev/pci/ubsec.c b/sys/dev/pci/ubsec.c
index 0e0cdd55947..3a1c95358f0 100644
--- a/sys/dev/pci/ubsec.c
+++ b/sys/dev/pci/ubsec.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ubsec.c,v 1.66 2001/07/04 06:03:55 jason Exp $ */
+/* $OpenBSD: ubsec.c,v 1.67 2001/08/12 20:03:49 mickey Exp $ */
/*
* Copyright (c) 2000 Jason L. Wright (jason@thought.net)
@@ -46,13 +46,11 @@
#include <sys/malloc.h>
#include <sys/kernel.h>
#include <sys/mbuf.h>
-#include <vm/vm.h>
-#include <vm/vm_extern.h>
-#include <vm/pmap.h>
-#include <machine/pmap.h>
#include <sys/device.h>
#include <sys/queue.h>
+#include <vm/vm.h>
+
#include <crypto/cryptodev.h>
#include <crypto/cryptosoft.h>
#include <dev/rndvar.h>