summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/pci/agp_ali.c3
-rw-r--r--sys/dev/pci/agp_amd.c3
-rw-r--r--sys/dev/pci/agp_i810.c3
-rw-r--r--sys/dev/pci/agp_intel.c3
-rw-r--r--sys/dev/pci/agp_sis.c3
-rw-r--r--sys/dev/pci/agp_via.c3
-rw-r--r--sys/dev/pci/ahci.c4
-rw-r--r--sys/dev/pci/alipm.c3
-rw-r--r--sys/dev/pci/amdiic.c3
-rw-r--r--sys/dev/pci/amdpm.c3
-rw-r--r--sys/dev/pci/arc.c3
-rw-r--r--sys/dev/pci/auacer.c3
-rw-r--r--sys/dev/pci/autri.c3
-rw-r--r--sys/dev/pci/berkwdt.c3
-rw-r--r--sys/dev/pci/cmpci.c3
-rw-r--r--sys/dev/pci/eap.c3
-rw-r--r--sys/dev/pci/ehci_pci.c4
-rw-r--r--sys/dev/pci/envy.c3
-rw-r--r--sys/dev/pci/eso.c3
-rw-r--r--sys/dev/pci/hifn7751.c4
-rw-r--r--sys/dev/pci/ichiic.c3
-rw-r--r--sys/dev/pci/if_age.c3
-rw-r--r--sys/dev/pci/if_alc.c3
-rw-r--r--sys/dev/pci/if_ale.c3
-rw-r--r--sys/dev/pci/if_de.c3
-rw-r--r--sys/dev/pci/if_lmc_common.c3
-rw-r--r--sys/dev/pci/if_lmc_media.c5
-rw-r--r--sys/dev/pci/if_lmc_obsd.c3
-rw-r--r--sys/dev/pci/if_tht.c4
-rw-r--r--sys/dev/pci/if_xge.c3
-rw-r--r--sys/dev/pci/if_xl_pci.c3
-rw-r--r--sys/dev/pci/iop_pci.c3
-rw-r--r--sys/dev/pci/jmb.c3
-rw-r--r--sys/dev/pci/lofn.c3
-rw-r--r--sys/dev/pci/maestro.c3
-rw-r--r--sys/dev/pci/mbg.c4
-rw-r--r--sys/dev/pci/musycc.c3
-rw-r--r--sys/dev/pci/nviic.c3
-rw-r--r--sys/dev/pci/ohci_pci.c4
-rw-r--r--sys/dev/pci/opl_cmpci.c3
-rw-r--r--sys/dev/pci/opl_eso.c3
-rw-r--r--sys/dev/pci/opl_yds.c3
-rw-r--r--sys/dev/pci/pccbb.c3
-rw-r--r--sys/dev/pci/piixpm.c3
-rw-r--r--sys/dev/pci/pwdog.c3
-rw-r--r--sys/dev/pci/ubsec.c4
-rw-r--r--sys/dev/pci/uhci_pci.c4
-rw-r--r--sys/dev/pci/viapm.c3
-rw-r--r--sys/dev/pci/wdt.c3
49 files changed, 58 insertions, 99 deletions
diff --git a/sys/dev/pci/agp_ali.c b/sys/dev/pci/agp_ali.c
index 5058ac0ca4c..078e8c1fa78 100644
--- a/sys/dev/pci/agp_ali.c
+++ b/sys/dev/pci/agp_ali.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: agp_ali.c,v 1.10 2009/05/10 16:57:44 oga Exp $ */
+/* $OpenBSD: agp_ali.c,v 1.11 2010/04/08 00:23:53 tedu Exp $ */
/* $NetBSD: agp_ali.c,v 1.2 2001/09/15 00:25:00 thorpej Exp $ */
@@ -34,7 +34,6 @@
#include <sys/kernel.h>
#include <sys/malloc.h>
#include <sys/systm.h>
-#include <sys/proc.h>
#include <sys/conf.h>
#include <sys/device.h>
#include <sys/lock.h>
diff --git a/sys/dev/pci/agp_amd.c b/sys/dev/pci/agp_amd.c
index 9fb2126ed92..7e40096dfd7 100644
--- a/sys/dev/pci/agp_amd.c
+++ b/sys/dev/pci/agp_amd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: agp_amd.c,v 1.14 2010/03/28 13:22:07 oga Exp $ */
+/* $OpenBSD: agp_amd.c,v 1.15 2010/04/08 00:23:53 tedu Exp $ */
/* $NetBSD: agp_amd.c,v 1.6 2001/10/06 02:48:50 thorpej Exp $ */
/*-
@@ -34,7 +34,6 @@
#include <sys/malloc.h>
#include <sys/kernel.h>
#include <sys/lock.h>
-#include <sys/proc.h>
#include <sys/conf.h>
#include <sys/device.h>
#include <sys/agpio.h>
diff --git a/sys/dev/pci/agp_i810.c b/sys/dev/pci/agp_i810.c
index 80a06307dae..538b0898b96 100644
--- a/sys/dev/pci/agp_i810.c
+++ b/sys/dev/pci/agp_i810.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: agp_i810.c,v 1.60 2010/04/07 20:40:18 oga Exp $ */
+/* $OpenBSD: agp_i810.c,v 1.61 2010/04/08 00:23:53 tedu Exp $ */
/*-
* Copyright (c) 2000 Doug Rabson
@@ -33,7 +33,6 @@
#include <sys/malloc.h>
#include <sys/kernel.h>
#include <sys/lock.h>
-#include <sys/proc.h>
#include <sys/device.h>
#include <sys/conf.h>
#include <sys/agpio.h>
diff --git a/sys/dev/pci/agp_intel.c b/sys/dev/pci/agp_intel.c
index d8dde36e9ae..8d9ae34ca27 100644
--- a/sys/dev/pci/agp_intel.c
+++ b/sys/dev/pci/agp_intel.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: agp_intel.c,v 1.15 2009/05/10 16:57:44 oga Exp $ */
+/* $OpenBSD: agp_intel.c,v 1.16 2010/04/08 00:23:53 tedu Exp $ */
/* $NetBSD: agp_intel.c,v 1.3 2001/09/15 00:25:00 thorpej Exp $ */
/*-
@@ -34,7 +34,6 @@
#include <sys/malloc.h>
#include <sys/kernel.h>
#include <sys/lock.h>
-#include <sys/proc.h>
#include <sys/agpio.h>
#include <sys/device.h>
#include <sys/agpio.h>
diff --git a/sys/dev/pci/agp_sis.c b/sys/dev/pci/agp_sis.c
index 8a0f9e6426c..b08d3b9d75c 100644
--- a/sys/dev/pci/agp_sis.c
+++ b/sys/dev/pci/agp_sis.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: agp_sis.c,v 1.13 2009/05/10 16:57:44 oga Exp $ */
+/* $OpenBSD: agp_sis.c,v 1.14 2010/04/08 00:23:53 tedu Exp $ */
/* $NetBSD: agp_sis.c,v 1.2 2001/09/15 00:25:00 thorpej Exp $ */
/*-
@@ -34,7 +34,6 @@
#include <sys/malloc.h>
#include <sys/kernel.h>
#include <sys/lock.h>
-#include <sys/proc.h>
#include <sys/conf.h>
#include <sys/device.h>
#include <sys/agpio.h>
diff --git a/sys/dev/pci/agp_via.c b/sys/dev/pci/agp_via.c
index cdec2b29feb..efacc75d2f2 100644
--- a/sys/dev/pci/agp_via.c
+++ b/sys/dev/pci/agp_via.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: agp_via.c,v 1.14 2009/05/10 16:57:44 oga Exp $ */
+/* $OpenBSD: agp_via.c,v 1.15 2010/04/08 00:23:53 tedu Exp $ */
/* $NetBSD: agp_via.c,v 1.2 2001/09/15 00:25:00 thorpej Exp $ */
/*-
@@ -34,7 +34,6 @@
#include <sys/malloc.h>
#include <sys/kernel.h>
#include <sys/lock.h>
-#include <sys/proc.h>
#include <sys/conf.h>
#include <sys/device.h>
#include <sys/agpio.h>
diff --git a/sys/dev/pci/ahci.c b/sys/dev/pci/ahci.c
index fe8daaa7742..1a5bcba9b8d 100644
--- a/sys/dev/pci/ahci.c
+++ b/sys/dev/pci/ahci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ahci.c,v 1.161 2010/04/06 13:59:37 dlg Exp $ */
+/* $OpenBSD: ahci.c,v 1.162 2010/04/08 00:23:53 tedu Exp $ */
/*
* Copyright (c) 2006 David Gwynne <dlg@openbsd.org>
@@ -22,7 +22,7 @@
#include <sys/kernel.h>
#include <sys/malloc.h>
#include <sys/device.h>
-#include <sys/proc.h>
+#include <sys/timeout.h>
#include <sys/queue.h>
#include <sys/mutex.h>
diff --git a/sys/dev/pci/alipm.c b/sys/dev/pci/alipm.c
index 79f58647f42..8c71bd497e5 100644
--- a/sys/dev/pci/alipm.c
+++ b/sys/dev/pci/alipm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: alipm.c,v 1.14 2009/03/29 21:53:52 sthen Exp $ */
+/* $OpenBSD: alipm.c,v 1.15 2010/04/08 00:23:53 tedu Exp $ */
/*
* Copyright (c) 2005 Mark Kettenis
@@ -20,7 +20,6 @@
#include <sys/device.h>
#include <sys/kernel.h>
#include <sys/rwlock.h>
-#include <sys/proc.h>
#include <sys/systm.h>
#include <dev/i2c/i2cvar.h>
diff --git a/sys/dev/pci/amdiic.c b/sys/dev/pci/amdiic.c
index 228a4dbbbd9..5aa4c269ceb 100644
--- a/sys/dev/pci/amdiic.c
+++ b/sys/dev/pci/amdiic.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: amdiic.c,v 1.7 2009/03/29 21:53:52 sthen Exp $ */
+/* $OpenBSD: amdiic.c,v 1.8 2010/04/08 00:23:53 tedu Exp $ */
/*
* Copyright (c) 2005 Alexander Yurchenko <grange@openbsd.org>
@@ -25,7 +25,6 @@
#include <sys/device.h>
#include <sys/kernel.h>
#include <sys/rwlock.h>
-#include <sys/proc.h>
#include <machine/bus.h>
diff --git a/sys/dev/pci/amdpm.c b/sys/dev/pci/amdpm.c
index 5ee50a47a9d..f5a071ea4c5 100644
--- a/sys/dev/pci/amdpm.c
+++ b/sys/dev/pci/amdpm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: amdpm.c,v 1.23 2008/06/26 05:42:17 ray Exp $ */
+/* $OpenBSD: amdpm.c,v 1.24 2010/04/08 00:23:53 tedu Exp $ */
/*
* Copyright (c) 2006 Alexander Yurchenko <grange@openbsd.org>
@@ -50,7 +50,6 @@
#include <sys/device.h>
#include <sys/kernel.h>
#include <sys/rwlock.h>
-#include <sys/proc.h>
#include <sys/timeout.h>
#ifdef __HAVE_TIMECOUNTER
#include <sys/timetc.h>
diff --git a/sys/dev/pci/arc.c b/sys/dev/pci/arc.c
index f94389ba6d5..bdc4d9a5e54 100644
--- a/sys/dev/pci/arc.c
+++ b/sys/dev/pci/arc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: arc.c,v 1.81 2010/03/23 01:57:20 krw Exp $ */
+/* $OpenBSD: arc.c,v 1.82 2010/04/08 00:23:53 tedu Exp $ */
/*
* Copyright (c) 2006 David Gwynne <dlg@openbsd.org>
@@ -24,7 +24,6 @@
#include <sys/kernel.h>
#include <sys/malloc.h>
#include <sys/device.h>
-#include <sys/proc.h>
#include <sys/rwlock.h>
#include <machine/bus.h>
diff --git a/sys/dev/pci/auacer.c b/sys/dev/pci/auacer.c
index 1e8f606d04b..c81adfe8b21 100644
--- a/sys/dev/pci/auacer.c
+++ b/sys/dev/pci/auacer.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auacer.c,v 1.5 2010/04/04 00:43:36 jakemsr Exp $ */
+/* $OpenBSD: auacer.c,v 1.6 2010/04/08 00:23:53 tedu Exp $ */
/* $NetBSD: auacer.c,v 1.3 2004/11/10 04:20:26 kent Exp $ */
/*-
@@ -45,7 +45,6 @@
#include <sys/malloc.h>
#include <sys/device.h>
#include <sys/fcntl.h>
-#include <sys/proc.h>
#include <dev/pci/pcidevs.h>
#include <dev/pci/pcivar.h>
diff --git a/sys/dev/pci/autri.c b/sys/dev/pci/autri.c
index ef9118acf58..9419bb45263 100644
--- a/sys/dev/pci/autri.c
+++ b/sys/dev/pci/autri.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: autri.c,v 1.23 2009/03/29 21:53:52 sthen Exp $ */
+/* $OpenBSD: autri.c,v 1.24 2010/04/08 00:23:53 tedu Exp $ */
/*
* Copyright (c) 2001 SOMEYA Yoshihiko and KUROSAWA Takahiro.
@@ -42,7 +42,6 @@
#include <sys/fcntl.h>
#include <sys/malloc.h>
#include <sys/device.h>
-#include <sys/proc.h>
#include <dev/pci/pcidevs.h>
#include <dev/pci/pcireg.h>
diff --git a/sys/dev/pci/berkwdt.c b/sys/dev/pci/berkwdt.c
index 66713249d04..c3b5d42f2da 100644
--- a/sys/dev/pci/berkwdt.c
+++ b/sys/dev/pci/berkwdt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: berkwdt.c,v 1.5 2009/04/25 07:11:55 mk Exp $ */
+/* $OpenBSD: berkwdt.c,v 1.6 2010/04/08 00:23:53 tedu Exp $ */
/*
* Copyright (c) 2009 Wim Van Sebroeck <wim@iguana.be>
@@ -25,7 +25,6 @@
#include <sys/param.h>
#include <sys/device.h>
#include <sys/kernel.h>
-#include <sys/proc.h>
#include <sys/systm.h>
#include <machine/bus.h>
diff --git a/sys/dev/pci/cmpci.c b/sys/dev/pci/cmpci.c
index 260fb8eaaf1..eb15bdfb63d 100644
--- a/sys/dev/pci/cmpci.c
+++ b/sys/dev/pci/cmpci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmpci.c,v 1.24 2009/05/06 23:13:29 jakemsr Exp $ */
+/* $OpenBSD: cmpci.c,v 1.25 2010/04/08 00:23:53 tedu Exp $ */
/* $NetBSD: cmpci.c,v 1.25 2004/10/26 06:32:20 xtraeme Exp $ */
/*
@@ -54,7 +54,6 @@ int cmpcidebug = 0;
#include <sys/kernel.h>
#include <sys/malloc.h>
#include <sys/device.h>
-#include <sys/proc.h>
#include <dev/pci/pcidevs.h>
#include <dev/pci/pcivar.h>
diff --git a/sys/dev/pci/eap.c b/sys/dev/pci/eap.c
index 797560bced3..e2b61167c11 100644
--- a/sys/dev/pci/eap.c
+++ b/sys/dev/pci/eap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: eap.c,v 1.37 2009/02/15 00:11:59 jakemsr Exp $ */
+/* $OpenBSD: eap.c,v 1.38 2010/04/08 00:23:53 tedu Exp $ */
/* $NetBSD: eap.c,v 1.46 2001/09/03 15:07:37 reinoud Exp $ */
/*
@@ -55,7 +55,6 @@
#include <sys/fcntl.h>
#include <sys/malloc.h>
#include <sys/device.h>
-#include <sys/proc.h>
#include <dev/pci/pcidevs.h>
#include <dev/pci/pcivar.h>
diff --git a/sys/dev/pci/ehci_pci.c b/sys/dev/pci/ehci_pci.c
index 03582b389fe..bfeb9e694c6 100644
--- a/sys/dev/pci/ehci_pci.c
+++ b/sys/dev/pci/ehci_pci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ehci_pci.c,v 1.18 2009/07/24 03:18:58 deraadt Exp $ */
+/* $OpenBSD: ehci_pci.c,v 1.19 2010/04/08 00:23:53 tedu Exp $ */
/* $NetBSD: ehci_pci.c,v 1.15 2004/04/23 21:13:06 itojun Exp $ */
/*
@@ -35,7 +35,7 @@
#include <sys/kernel.h>
#include <sys/rwlock.h>
#include <sys/device.h>
-#include <sys/proc.h>
+#include <sys/timeout.h>
#include <sys/queue.h>
#include <machine/bus.h>
diff --git a/sys/dev/pci/envy.c b/sys/dev/pci/envy.c
index d0334d133a5..39d483694d7 100644
--- a/sys/dev/pci/envy.c
+++ b/sys/dev/pci/envy.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: envy.c,v 1.35 2010/03/07 18:55:45 ratchov Exp $ */
+/* $OpenBSD: envy.c,v 1.36 2010/04/08 00:23:53 tedu Exp $ */
/*
* Copyright (c) 2007 Alexandre Ratchov <alex@caoua.org>
*
@@ -32,7 +32,6 @@
#include <sys/ioctl.h>
#include <sys/audioio.h>
#include <sys/malloc.h>
-#include <sys/proc.h>
#include <sys/kernel.h>
#include <dev/audio_if.h>
#include <dev/ic/ac97.h>
diff --git a/sys/dev/pci/eso.c b/sys/dev/pci/eso.c
index 5e10bc020d2..bbcb5879e30 100644
--- a/sys/dev/pci/eso.c
+++ b/sys/dev/pci/eso.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: eso.c,v 1.28 2009/03/29 21:53:52 sthen Exp $ */
+/* $OpenBSD: eso.c,v 1.29 2010/04/08 00:23:53 tedu Exp $ */
/* $NetBSD: eso.c,v 1.48 2006/12/18 23:13:39 kleink Exp $ */
/*
@@ -38,7 +38,6 @@
#include <sys/kernel.h>
#include <sys/malloc.h>
#include <sys/device.h>
-#include <sys/proc.h>
#include <dev/pci/pcidevs.h>
#include <dev/pci/pcivar.h>
diff --git a/sys/dev/pci/hifn7751.c b/sys/dev/pci/hifn7751.c
index 660c6be6ef3..de52be79c3e 100644
--- a/sys/dev/pci/hifn7751.c
+++ b/sys/dev/pci/hifn7751.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hifn7751.c,v 1.158 2009/09/13 14:42:52 krw Exp $ */
+/* $OpenBSD: hifn7751.c,v 1.159 2010/04/08 00:23:53 tedu Exp $ */
/*
* Invertex AEON / Hifn 7751 driver
@@ -47,7 +47,7 @@
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/proc.h>
+#include <sys/timeout.h>
#include <sys/errno.h>
#include <sys/malloc.h>
#include <sys/kernel.h>
diff --git a/sys/dev/pci/ichiic.c b/sys/dev/pci/ichiic.c
index 668ed4b343b..b732aba3ca3 100644
--- a/sys/dev/pci/ichiic.c
+++ b/sys/dev/pci/ichiic.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ichiic.c,v 1.23 2009/10/27 23:18:32 sthen Exp $ */
+/* $OpenBSD: ichiic.c,v 1.24 2010/04/08 00:23:53 tedu Exp $ */
/*
* Copyright (c) 2005, 2006 Alexander Yurchenko <grange@openbsd.org>
@@ -25,7 +25,6 @@
#include <sys/device.h>
#include <sys/kernel.h>
#include <sys/rwlock.h>
-#include <sys/proc.h>
#include <machine/bus.h>
diff --git a/sys/dev/pci/if_age.c b/sys/dev/pci/if_age.c
index 73acdded486..a9f1e04644d 100644
--- a/sys/dev/pci/if_age.c
+++ b/sys/dev/pci/if_age.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_age.c,v 1.9 2010/02/27 08:19:47 kevlo Exp $ */
+/* $OpenBSD: if_age.c,v 1.10 2010/04/08 00:23:53 tedu Exp $ */
/*-
* Copyright (c) 2008, Pyun YongHyeon <yongari@FreeBSD.org>
@@ -33,7 +33,6 @@
#include "vlan.h"
#include <sys/param.h>
-#include <sys/proc.h>
#include <sys/endian.h>
#include <sys/systm.h>
#include <sys/types.h>
diff --git a/sys/dev/pci/if_alc.c b/sys/dev/pci/if_alc.c
index b0cc3199a99..95936997560 100644
--- a/sys/dev/pci/if_alc.c
+++ b/sys/dev/pci/if_alc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_alc.c,v 1.4 2010/02/27 08:19:47 kevlo Exp $ */
+/* $OpenBSD: if_alc.c,v 1.5 2010/04/08 00:23:53 tedu Exp $ */
/*-
* Copyright (c) 2009, Pyun YongHyeon <yongari@FreeBSD.org>
* All rights reserved.
@@ -32,7 +32,6 @@
#include "vlan.h"
#include <sys/param.h>
-#include <sys/proc.h>
#include <sys/endian.h>
#include <sys/systm.h>
#include <sys/types.h>
diff --git a/sys/dev/pci/if_ale.c b/sys/dev/pci/if_ale.c
index 0ecef47a64f..5d2dba05edd 100644
--- a/sys/dev/pci/if_ale.c
+++ b/sys/dev/pci/if_ale.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_ale.c,v 1.11 2010/02/27 08:19:47 kevlo Exp $ */
+/* $OpenBSD: if_ale.c,v 1.12 2010/04/08 00:23:53 tedu Exp $ */
/*-
* Copyright (c) 2008, Pyun YongHyeon <yongari@FreeBSD.org>
* All rights reserved.
@@ -34,7 +34,6 @@
#include "vlan.h"
#include <sys/param.h>
-#include <sys/proc.h>
#include <sys/endian.h>
#include <sys/systm.h>
#include <sys/types.h>
diff --git a/sys/dev/pci/if_de.c b/sys/dev/pci/if_de.c
index bdfed607d0d..65db468fed1 100644
--- a/sys/dev/pci/if_de.c
+++ b/sys/dev/pci/if_de.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_de.c,v 1.104 2009/10/02 23:11:56 deraadt Exp $ */
+/* $OpenBSD: if_de.c,v 1.105 2010/04/08 00:23:53 tedu Exp $ */
/* $NetBSD: if_de.c,v 1.58 1998/01/12 09:39:58 thorpej Exp $ */
/*-
@@ -47,7 +47,6 @@
#include <sys/errno.h>
#include <sys/malloc.h>
#include <sys/kernel.h>
-#include <sys/proc.h> /* only for declaration of wakeup() used by vm.h */
#include <sys/device.h>
#include <sys/timeout.h>
diff --git a/sys/dev/pci/if_lmc_common.c b/sys/dev/pci/if_lmc_common.c
index af256dd46a3..a7ac9c465f0 100644
--- a/sys/dev/pci/if_lmc_common.c
+++ b/sys/dev/pci/if_lmc_common.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_lmc_common.c,v 1.11 2005/11/07 00:29:21 brad Exp $ */
+/* $OpenBSD: if_lmc_common.c,v 1.12 2010/04/08 00:23:53 tedu Exp $ */
/* $NetBSD: if_lmc_common.c,v 1.1 1999/03/25 03:32:43 explorer Exp $ */
/*-
@@ -73,7 +73,6 @@
#include <sys/errno.h>
#include <sys/malloc.h>
#include <sys/kernel.h>
-#include <sys/proc.h> /* only for declaration of wakeup() used by vm.h */
#include <sys/device.h>
#include <dev/pci/pcidevs.h>
diff --git a/sys/dev/pci/if_lmc_media.c b/sys/dev/pci/if_lmc_media.c
index 6b5f87013c3..234facc1699 100644
--- a/sys/dev/pci/if_lmc_media.c
+++ b/sys/dev/pci/if_lmc_media.c
@@ -1,5 +1,5 @@
-/* $OpenBSD: if_lmc_media.c,v 1.16 2005/11/07 00:29:21 brad Exp $ */
-/* $Id: if_lmc_media.c,v 1.16 2005/11/07 00:29:21 brad Exp $ */
+/* $OpenBSD: if_lmc_media.c,v 1.17 2010/04/08 00:23:53 tedu Exp $ */
+/* $Id: if_lmc_media.c,v 1.17 2010/04/08 00:23:53 tedu Exp $ */
/*-
* Copyright (c) 1997-1999 LAN Media Corporation (LMC)
@@ -49,7 +49,6 @@
#include <sys/errno.h>
#include <sys/malloc.h>
#include <sys/kernel.h>
-#include <sys/proc.h> /* only for declaration of wakeup() used by vm.h */
#include <sys/device.h>
#include <dev/pci/pcidevs.h>
diff --git a/sys/dev/pci/if_lmc_obsd.c b/sys/dev/pci/if_lmc_obsd.c
index 197249bb74a..54ef40ce79a 100644
--- a/sys/dev/pci/if_lmc_obsd.c
+++ b/sys/dev/pci/if_lmc_obsd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_lmc_obsd.c,v 1.20 2009/08/13 14:24:47 jasper Exp $ */
+/* $OpenBSD: if_lmc_obsd.c,v 1.21 2010/04/08 00:23:53 tedu Exp $ */
/* $NetBSD: if_lmc_nbsd.c,v 1.1 1999/03/25 03:32:43 explorer Exp $ */
/*-
@@ -73,7 +73,6 @@
#include <sys/errno.h>
#include <sys/malloc.h>
#include <sys/kernel.h>
-#include <sys/proc.h> /* only for declaration of wakeup() used by vm.h */
#include <sys/device.h>
#include <dev/pci/pcidevs.h>
diff --git a/sys/dev/pci/if_tht.c b/sys/dev/pci/if_tht.c
index 7439b1dfbdc..3efa0a960fd 100644
--- a/sys/dev/pci/if_tht.c
+++ b/sys/dev/pci/if_tht.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_tht.c,v 1.122 2009/04/07 05:03:25 dlg Exp $ */
+/* $OpenBSD: if_tht.c,v 1.123 2010/04/08 00:23:53 tedu Exp $ */
/*
* Copyright (c) 2007 David Gwynne <dlg@openbsd.org>
@@ -34,7 +34,7 @@
#include <sys/socket.h>
#include <sys/malloc.h>
#include <sys/device.h>
-#include <sys/proc.h>
+#include <sys/timeout.h>
#include <sys/queue.h>
#include <sys/rwlock.h>
#include <sys/time.h>
diff --git a/sys/dev/pci/if_xge.c b/sys/dev/pci/if_xge.c
index 73501206e35..38251245f0d 100644
--- a/sys/dev/pci/if_xge.c
+++ b/sys/dev/pci/if_xge.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_xge.c,v 1.51 2009/08/13 14:24:47 jasper Exp $ */
+/* $OpenBSD: if_xge.c,v 1.52 2010/04/08 00:23:53 tedu Exp $ */
/* $NetBSD: if_xge.c,v 1.1 2005/09/09 10:30:27 ragge Exp $ */
/*
@@ -86,7 +86,6 @@
#include <dev/pci/pcidevs.h>
#include <sys/lock.h>
-#include <sys/proc.h>
#include <dev/pci/if_xgereg.h>
diff --git a/sys/dev/pci/if_xl_pci.c b/sys/dev/pci/if_xl_pci.c
index 0a48a82933d..b950efa9aaa 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.28 2010/01/11 23:21:24 kettenis Exp $ */
+/* $OpenBSD: if_xl_pci.c,v 1.29 2010/04/08 00:23:53 tedu Exp $ */
/*
* Copyright (c) 1997, 1998, 1999
@@ -45,7 +45,6 @@
#include <sys/errno.h>
#include <sys/malloc.h>
#include <sys/kernel.h>
-#include <sys/proc.h> /* only for declaration of wakeup() used by vm.h */
#include <sys/device.h>
#include <net/if.h>
diff --git a/sys/dev/pci/iop_pci.c b/sys/dev/pci/iop_pci.c
index 43a12e14978..08a10ae00ec 100644
--- a/sys/dev/pci/iop_pci.c
+++ b/sys/dev/pci/iop_pci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: iop_pci.c,v 1.6 2008/06/26 05:42:17 ray Exp $ */
+/* $OpenBSD: iop_pci.c,v 1.7 2010/04/08 00:23:53 tedu Exp $ */
/* $NetBSD: iop_pci.c,v 1.4 2001/03/20 13:21:00 ad Exp $ */
/*-
@@ -39,7 +39,6 @@
#include <sys/kernel.h>
#include <sys/device.h>
#include <sys/queue.h>
-#include <sys/proc.h>
#include <machine/endian.h>
#include <machine/bus.h>
diff --git a/sys/dev/pci/jmb.c b/sys/dev/pci/jmb.c
index ea65e7b91d2..e87de0ed12a 100644
--- a/sys/dev/pci/jmb.c
+++ b/sys/dev/pci/jmb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: jmb.c,v 1.7 2008/03/27 09:21:59 dlg Exp $ */
+/* $OpenBSD: jmb.c,v 1.8 2010/04/08 00:23:53 tedu Exp $ */
/*
* Copyright (c) 2007 David Gwynne <dlg@openbsd.org>
@@ -22,7 +22,6 @@
#include <sys/kernel.h>
#include <sys/malloc.h>
#include <sys/device.h>
-#include <sys/proc.h>
#include <sys/queue.h>
#include <machine/bus.h>
diff --git a/sys/dev/pci/lofn.c b/sys/dev/pci/lofn.c
index 7a51761f93e..4431b6fe415 100644
--- a/sys/dev/pci/lofn.c
+++ b/sys/dev/pci/lofn.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lofn.c,v 1.27 2006/06/29 21:34:51 deraadt Exp $ */
+/* $OpenBSD: lofn.c,v 1.28 2010/04/08 00:23:53 tedu Exp $ */
/*
* Copyright (c) 2001-2002 Jason L. Wright (jason@thought.net)
@@ -37,7 +37,6 @@
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/proc.h>
#include <sys/errno.h>
#include <sys/malloc.h>
#include <sys/kernel.h>
diff --git a/sys/dev/pci/maestro.c b/sys/dev/pci/maestro.c
index 444dae82988..63036064786 100644
--- a/sys/dev/pci/maestro.c
+++ b/sys/dev/pci/maestro.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: maestro.c,v 1.27 2009/03/29 21:53:52 sthen Exp $ */
+/* $OpenBSD: maestro.c,v 1.28 2010/04/08 00:23:53 tedu Exp $ */
/* $FreeBSD: /c/ncvs/src/sys/dev/sound/pci/maestro.c,v 1.3 2000/11/21 12:22:11 julian Exp $ */
/*
* FreeBSD's ESS Agogo/Maestro driver
@@ -51,7 +51,6 @@
#include <sys/kernel.h>
#include <sys/malloc.h>
#include <sys/device.h>
-#include <sys/proc.h>
#include <sys/queue.h>
#include <sys/fcntl.h>
diff --git a/sys/dev/pci/mbg.c b/sys/dev/pci/mbg.c
index 7e9c5bcdaac..de7dfdd88f9 100644
--- a/sys/dev/pci/mbg.c
+++ b/sys/dev/pci/mbg.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mbg.c,v 1.28 2009/04/26 02:20:58 cnst Exp $ */
+/* $OpenBSD: mbg.c,v 1.29 2010/04/08 00:23:53 tedu Exp $ */
/*
* Copyright (c) 2006, 2007 Marc Balmer <mbalmer@openbsd.org>
@@ -20,7 +20,7 @@
#include <sys/param.h>
#include <sys/device.h>
#include <sys/kernel.h>
-#include <sys/proc.h>
+#include <sys/timeout.h>
#include <sys/systm.h>
#include <sys/sensors.h>
#include <sys/syslog.h>
diff --git a/sys/dev/pci/musycc.c b/sys/dev/pci/musycc.c
index 122539adcdf..d641ac96164 100644
--- a/sys/dev/pci/musycc.c
+++ b/sys/dev/pci/musycc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: musycc.c,v 1.19 2008/09/18 09:06:27 chl Exp $ */
+/* $OpenBSD: musycc.c,v 1.20 2010/04/08 00:23:53 tedu Exp $ */
/*
* Copyright (c) 2004,2005 Internet Business Solutions AG, Zurich, Switzerland
@@ -26,7 +26,6 @@
#include <sys/limits.h>
#include <sys/malloc.h>
#include <sys/mbuf.h>
-#include <sys/proc.h>
#include <sys/socket.h>
#include <sys/syslog.h>
#include <sys/systm.h>
diff --git a/sys/dev/pci/nviic.c b/sys/dev/pci/nviic.c
index 3758d203ea2..9386bb5e42d 100644
--- a/sys/dev/pci/nviic.c
+++ b/sys/dev/pci/nviic.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: nviic.c,v 1.14 2009/06/18 08:19:03 jsg Exp $ */
+/* $OpenBSD: nviic.c,v 1.15 2010/04/08 00:23:53 tedu Exp $ */
/*
* Copyright (c) 2005 David Gwynne <dlg@openbsd.org>
@@ -21,7 +21,6 @@
#include <sys/device.h>
#include <sys/kernel.h>
#include <sys/rwlock.h>
-#include <sys/proc.h>
#include <machine/bus.h>
diff --git a/sys/dev/pci/ohci_pci.c b/sys/dev/pci/ohci_pci.c
index a70f1179364..3fbf5054bd1 100644
--- a/sys/dev/pci/ohci_pci.c
+++ b/sys/dev/pci/ohci_pci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ohci_pci.c,v 1.33 2008/06/26 05:42:17 ray Exp $ */
+/* $OpenBSD: ohci_pci.c,v 1.34 2010/04/08 00:23:53 tedu Exp $ */
/* $NetBSD: ohci_pci.c,v 1.23 2002/10/02 16:51:47 thorpej Exp $ */
/*
@@ -42,7 +42,7 @@
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/device.h>
-#include <sys/proc.h>
+#include <sys/timeout.h>
#include <sys/queue.h>
#include <machine/bus.h>
diff --git a/sys/dev/pci/opl_cmpci.c b/sys/dev/pci/opl_cmpci.c
index 8408789085f..f089786b400 100644
--- a/sys/dev/pci/opl_cmpci.c
+++ b/sys/dev/pci/opl_cmpci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: opl_cmpci.c,v 1.4 2008/06/26 05:42:17 ray Exp $ */
+/* $OpenBSD: opl_cmpci.c,v 1.5 2010/04/08 00:23:53 tedu Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -35,7 +35,6 @@
#include <sys/errno.h>
#include <sys/device.h>
#include <sys/malloc.h>
-#include <sys/proc.h>
#include <sys/conf.h>
#include <sys/selinfo.h>
#include <sys/audioio.h>
diff --git a/sys/dev/pci/opl_eso.c b/sys/dev/pci/opl_eso.c
index ceb6a231f0c..10f88ab88ed 100644
--- a/sys/dev/pci/opl_eso.c
+++ b/sys/dev/pci/opl_eso.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: opl_eso.c,v 1.6 2008/06/26 05:42:17 ray Exp $ */
+/* $OpenBSD: opl_eso.c,v 1.7 2010/04/08 00:23:53 tedu Exp $ */
/* $NetBSD: opl_eso.c,v 1.1 1999/07/12 15:13:31 kleink Exp $ */
/*
@@ -44,7 +44,6 @@
#include <sys/errno.h>
#include <sys/device.h>
#include <sys/malloc.h>
-#include <sys/proc.h>
#include <sys/conf.h>
#include <sys/selinfo.h>
#include <sys/audioio.h>
diff --git a/sys/dev/pci/opl_yds.c b/sys/dev/pci/opl_yds.c
index c2c84c68e5b..926533456d1 100644
--- a/sys/dev/pci/opl_yds.c
+++ b/sys/dev/pci/opl_yds.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: opl_yds.c,v 1.7 2008/06/26 05:42:17 ray Exp $ */
+/* $OpenBSD: opl_yds.c,v 1.8 2010/04/08 00:23:53 tedu Exp $ */
/* $NetBSD$ */
/*
@@ -36,7 +36,6 @@
#include <sys/errno.h>
#include <sys/device.h>
#include <sys/malloc.h>
-#include <sys/proc.h>
#include <sys/conf.h>
#include <sys/selinfo.h>
#include <sys/audioio.h>
diff --git a/sys/dev/pci/pccbb.c b/sys/dev/pci/pccbb.c
index e0475ead48e..b9ec92b009e 100644
--- a/sys/dev/pci/pccbb.c
+++ b/sys/dev/pci/pccbb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pccbb.c,v 1.74 2010/03/27 21:40:13 jsg Exp $ */
+/* $OpenBSD: pccbb.c,v 1.75 2010/04/08 00:23:53 tedu Exp $ */
/* $NetBSD: pccbb.c,v 1.96 2004/03/28 09:49:31 nakayama Exp $ */
/*
@@ -48,7 +48,6 @@
#include <sys/syslog.h>
#include <sys/device.h>
#include <sys/malloc.h>
-#include <sys/proc.h>
#include <machine/intr.h>
#include <machine/bus.h>
diff --git a/sys/dev/pci/piixpm.c b/sys/dev/pci/piixpm.c
index cc4bf559c82..b9105c0f3bb 100644
--- a/sys/dev/pci/piixpm.c
+++ b/sys/dev/pci/piixpm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: piixpm.c,v 1.33 2009/11/05 09:37:05 sthen Exp $ */
+/* $OpenBSD: piixpm.c,v 1.34 2010/04/08 00:23:53 tedu Exp $ */
/*
* Copyright (c) 2005, 2006 Alexander Yurchenko <grange@openbsd.org>
@@ -25,7 +25,6 @@
#include <sys/device.h>
#include <sys/kernel.h>
#include <sys/rwlock.h>
-#include <sys/proc.h>
#include <machine/bus.h>
diff --git a/sys/dev/pci/pwdog.c b/sys/dev/pci/pwdog.c
index dfa250daef7..8d5f65f7bc2 100644
--- a/sys/dev/pci/pwdog.c
+++ b/sys/dev/pci/pwdog.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pwdog.c,v 1.6 2006/12/17 15:56:23 mbalmer Exp $ */
+/* $OpenBSD: pwdog.c,v 1.7 2010/04/08 00:23:53 tedu Exp $ */
/*
* Copyright (c) 2006 Marc Balmer <mbalmer@openbsd.org>
@@ -20,7 +20,6 @@
#include <sys/param.h>
#include <sys/device.h>
#include <sys/kernel.h>
-#include <sys/proc.h>
#include <sys/systm.h>
#include <machine/bus.h>
diff --git a/sys/dev/pci/ubsec.c b/sys/dev/pci/ubsec.c
index bd34bfc485a..5e0beb0dcf6 100644
--- a/sys/dev/pci/ubsec.c
+++ b/sys/dev/pci/ubsec.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ubsec.c,v 1.145 2010/01/10 12:43:07 markus Exp $ */
+/* $OpenBSD: ubsec.c,v 1.146 2010/04/08 00:23:53 tedu Exp $ */
/*
* Copyright (c) 2000 Jason L. Wright (jason@thought.net)
@@ -40,7 +40,7 @@
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/proc.h>
+#include <sys/timeout.h>
#include <sys/errno.h>
#include <sys/malloc.h>
#include <sys/kernel.h>
diff --git a/sys/dev/pci/uhci_pci.c b/sys/dev/pci/uhci_pci.c
index 6d7fb3c0777..aa2f4982abf 100644
--- a/sys/dev/pci/uhci_pci.c
+++ b/sys/dev/pci/uhci_pci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uhci_pci.c,v 1.27 2008/06/26 05:42:17 ray Exp $ */
+/* $OpenBSD: uhci_pci.c,v 1.28 2010/04/08 00:23:54 tedu Exp $ */
/* $NetBSD: uhci_pci.c,v 1.24 2002/10/02 16:51:58 thorpej Exp $ */
/*
@@ -35,7 +35,7 @@
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/device.h>
-#include <sys/proc.h>
+#include <sys/timeout.h>
#include <sys/queue.h>
#include <machine/bus.h>
diff --git a/sys/dev/pci/viapm.c b/sys/dev/pci/viapm.c
index 2c4b92a7c89..d4d4ade672f 100644
--- a/sys/dev/pci/viapm.c
+++ b/sys/dev/pci/viapm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: viapm.c,v 1.12 2009/06/26 02:46:27 kevlo Exp $ */
+/* $OpenBSD: viapm.c,v 1.13 2010/04/08 00:23:54 tedu Exp $ */
/*
* Copyright (c) 2005 Mark Kettenis <kettenis@openbsd.org>
@@ -25,7 +25,6 @@
#include <sys/device.h>
#include <sys/kernel.h>
#include <sys/rwlock.h>
-#include <sys/proc.h>
#include <machine/bus.h>
diff --git a/sys/dev/pci/wdt.c b/sys/dev/pci/wdt.c
index de0f0ce2937..e6b557c5fc5 100644
--- a/sys/dev/pci/wdt.c
+++ b/sys/dev/pci/wdt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wdt.c,v 1.18 2009/04/25 17:50:48 mk Exp $ */
+/* $OpenBSD: wdt.c,v 1.19 2010/04/08 00:23:54 tedu Exp $ */
/*-
* Copyright (c) 1998,1999 Alex Nash
@@ -31,7 +31,6 @@
#include <sys/param.h>
#include <sys/device.h>
#include <sys/kernel.h>
-#include <sys/proc.h>
#include <sys/systm.h>
#include <machine/bus.h>