Clean up after removing sys/eventhandler.h from sys/systm.h at the last

minute.  This should cover all of the missed cases (and should let LINT
build again).

16 files changed, 36 insertions, 16 deletions

diff --git a/sys/dev/dpt/dpt_scsi.c b/sys/dev/dpt/dpt_scsi.c
index aae96a9..c42f171 100644
--- a/sys/dev/dpt/dpt_scsi.c
+++ b/sys/dev/dpt/dpt_scsi.c
@@ -43,13 +43,14 @@
  *	       arrays that span controllers (Wow!).
  */
 
-#ident "$Id: dpt_scsi.c,v 1.24 1999/08/16 01:49:35 gibbs Exp $"
+#ident "$Id: dpt_scsi.c,v 1.25 1999/08/21 06:24:02 msmith Exp $"
 
 #define _DPT_C_
 
 #include "opt_dpt.h"
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/eventhandler.h>
 #include <sys/malloc.h>
 #include <sys/buf.h>
 #include <sys/kernel.h>
diff --git a/sys/dev/en/if_en_pci.c b/sys/dev/en/if_en_pci.c
index 30d9e98..a72a292 100644
--- a/sys/dev/en/if_en_pci.c
+++ b/sys/dev/en/if_en_pci.c
@@ -50,6 +50,9 @@
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
+#if defined(__FreeBSD__)
+#include <sys/eventhandler.h>
+#endif
 #include <sys/malloc.h>
 #include <sys/socket.h>
 
diff --git a/sys/dev/ie/if_ie.c b/sys/dev/ie/if_ie.c
index b7e04df..d6c928b 100644
--- a/sys/dev/ie/if_ie.c
+++ b/sys/dev/ie/if_ie.c
@@ -47,7 +47,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_ie.c,v 1.65 1999/08/20 14:36:40 mdodd Exp $
+ *	$Id: if_ie.c,v 1.66 1999/08/21 06:24:14 msmith Exp $
  */
 
 /*
@@ -113,6 +113,7 @@ iomem and and with 0xffff.
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/eventhandler.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/conf.h>
diff --git a/sys/dev/pdq/if_fpa.c b/sys/dev/pdq/if_fpa.c
index 57bc72d..7d816b8 100644
--- a/sys/dev/pdq/if_fpa.c
+++ b/sys/dev/pdq/if_fpa.c
@@ -21,7 +21,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: if_fpa.c,v 1.10 1999/05/09 17:06:54 peter Exp $
+ * $Id: if_fpa.c,v 1.11 1999/08/21 06:24:34 msmith Exp $
  *
  */
 
@@ -42,6 +42,7 @@
 
 #if defined(__FreeBSD__)
 #include "fpa.h"
+#include <sys/eventhandler.h>
 #include <net/ethernet.h>
 #include <net/if_arp.h>
 #include <pci/pcivar.h>
diff --git a/sys/dev/tx/if_tx.c b/sys/dev/tx/if_tx.c
index af694f6..b7cdc5d 100644
--- a/sys/dev/tx/if_tx.c
+++ b/sys/dev/tx/if_tx.c
@@ -1,5 +1,5 @@
 /*	$OpenBSD: if_tx.c,v 1.3 1998/10/10 04:30:09 jason Exp $	*/
-/*	$Id: if_tx.c,v 1.29 1999/07/06 19:23:30 des Exp $ */
+/*	$Id: if_tx.c,v 1.30 1999/08/21 06:24:35 msmith Exp $ */
 
 /*-
  * Copyright (c) 1997 Semen Ustimenko (semen@iclub.nsu.ru)
@@ -125,6 +125,7 @@
 
 #include <dev/pci/if_txvar.h>
 #else /* __FreeBSD__ */
+#include <sys/eventhandler.h>
 #include <net/if_mib.h>
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
diff --git a/sys/dev/vx/if_vx_pci.c b/sys/dev/vx/if_vx_pci.c
index 386ba42..e4910ad 100644
--- a/sys/dev/vx/if_vx_pci.c
+++ b/sys/dev/vx/if_vx_pci.c
@@ -34,6 +34,7 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/eventhandler.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
 
diff --git a/sys/dev/wi/if_wi.c b/sys/dev/wi/if_wi.c
index 5b6467f..0a92e80 100644
--- a/sys/dev/wi/if_wi.c
+++ b/sys/dev/wi/if_wi.c
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_wi.c,v 1.8 1999/07/06 19:22:53 des Exp $
+ *	$Id: if_wi.c,v 1.9 1999/08/21 06:24:15 msmith Exp $
  */
 
 /*
@@ -73,6 +73,7 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/eventhandler.h>
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
 #include <sys/malloc.h>
@@ -116,7 +117,7 @@
 
 #if !defined(lint)
 static const char rcsid[] =
-	"$Id: if_wi.c,v 1.8 1999/07/06 19:22:53 des Exp $";
+	"$Id: if_wi.c,v 1.9 1999/08/21 06:24:15 msmith Exp $";
 #endif
 
 static struct wi_softc wi_softc[NWI];
diff --git a/sys/i386/isa/if_ie.c b/sys/i386/isa/if_ie.c
index b7e04df..d6c928b 100644
--- a/sys/i386/isa/if_ie.c
+++ b/sys/i386/isa/if_ie.c
@@ -47,7 +47,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_ie.c,v 1.65 1999/08/20 14:36:40 mdodd Exp $
+ *	$Id: if_ie.c,v 1.66 1999/08/21 06:24:14 msmith Exp $
  */
 
 /*
@@ -113,6 +113,7 @@ iomem and and with 0xffff.
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/eventhandler.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/conf.h>
diff --git a/sys/i386/isa/if_wi.c b/sys/i386/isa/if_wi.c
index 5b6467f..0a92e80 100644
--- a/sys/i386/isa/if_wi.c
+++ b/sys/i386/isa/if_wi.c
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_wi.c,v 1.8 1999/07/06 19:22:53 des Exp $
+ *	$Id: if_wi.c,v 1.9 1999/08/21 06:24:15 msmith Exp $
  */
 
 /*
@@ -73,6 +73,7 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/eventhandler.h>
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
 #include <sys/malloc.h>
@@ -116,7 +117,7 @@
 
 #if !defined(lint)
 static const char rcsid[] =
-	"$Id: if_wi.c,v 1.8 1999/07/06 19:22:53 des Exp $";
+	"$Id: if_wi.c,v 1.9 1999/08/21 06:24:15 msmith Exp $";
 #endif
 
 static struct wi_softc wi_softc[NWI];
diff --git a/sys/netatm/kern_include.h b/sys/netatm/kern_include.h
index 9134206..78700db 100644
--- a/sys/netatm/kern_include.h
+++ b/sys/netatm/kern_include.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: kern_include.h,v 1.7 1998/07/23 21:44:40 root Exp $
+ *	@(#) $Id: kern_include.h,v 1.1 1998/09/15 08:22:59 phk Exp $
  *
  */
 
@@ -69,6 +69,7 @@
 #endif
 
 #ifdef __FreeBSD__
+#include <sys/eventhandler.h>
 #include <machine/clock.h>
 #include <vm/vm.h>
 #include <vm/pmap.h>
diff --git a/sys/pci/if_al.c b/sys/pci/if_al.c
index ba36544..1c3c773 100644
--- a/sys/pci/if_al.c
+++ b/sys/pci/if_al.c
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_al.c,v 1.6 1999/07/06 19:23:22 des Exp $
+ *	$Id: if_al.c,v 1.7 1999/08/21 06:24:32 msmith Exp $
  */
 
 /*
@@ -53,6 +53,7 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/eventhandler.h>
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
 #include <sys/malloc.h>
@@ -90,7 +91,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: if_al.c,v 1.6 1999/07/06 19:23:22 des Exp $";
+	"$Id: if_al.c,v 1.7 1999/08/21 06:24:32 msmith Exp $";
 #endif
 
 /*
diff --git a/sys/pci/if_en_pci.c b/sys/pci/if_en_pci.c
index 30d9e98..a72a292 100644
--- a/sys/pci/if_en_pci.c
+++ b/sys/pci/if_en_pci.c
@@ -50,6 +50,9 @@
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
+#if defined(__FreeBSD__)
+#include <sys/eventhandler.h>
+#endif
 #include <sys/malloc.h>
 #include <sys/socket.h>
 
diff --git a/sys/pci/if_fpa.c b/sys/pci/if_fpa.c
index 57bc72d..7d816b8 100644
--- a/sys/pci/if_fpa.c
+++ b/sys/pci/if_fpa.c
@@ -21,7 +21,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: if_fpa.c,v 1.10 1999/05/09 17:06:54 peter Exp $
+ * $Id: if_fpa.c,v 1.11 1999/08/21 06:24:34 msmith Exp $
  *
  */
 
@@ -42,6 +42,7 @@
 
 #if defined(__FreeBSD__)
 #include "fpa.h"
+#include <sys/eventhandler.h>
 #include <net/ethernet.h>
 #include <net/if_arp.h>
 #include <pci/pcivar.h>
diff --git a/sys/pci/if_rl.c b/sys/pci/if_rl.c
index 8fc7fbe..223f878 100644
--- a/sys/pci/if_rl.c
+++ b/sys/pci/if_rl.c
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_rl.c,v 1.20 1999/07/22 20:56:49 wpaul Exp $
+ *	$Id: if_rl.c,v 1.21 1999/08/21 06:24:35 msmith Exp $
  */
 
 /*
@@ -87,6 +87,7 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/eventhandler.h>
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
 #include <sys/malloc.h>
@@ -127,7 +128,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: if_rl.c,v 1.20 1999/07/22 20:56:49 wpaul Exp $";
+	"$Id: if_rl.c,v 1.21 1999/08/21 06:24:35 msmith Exp $";
 #endif
 
 /*
diff --git a/sys/pci/if_tx.c b/sys/pci/if_tx.c
index af694f6..b7cdc5d 100644
--- a/sys/pci/if_tx.c
+++ b/sys/pci/if_tx.c
@@ -1,5 +1,5 @@
 /*	$OpenBSD: if_tx.c,v 1.3 1998/10/10 04:30:09 jason Exp $	*/
-/*	$Id: if_tx.c,v 1.29 1999/07/06 19:23:30 des Exp $ */
+/*	$Id: if_tx.c,v 1.30 1999/08/21 06:24:35 msmith Exp $ */
 
 /*-
  * Copyright (c) 1997 Semen Ustimenko (semen@iclub.nsu.ru)
@@ -125,6 +125,7 @@
 
 #include <dev/pci/if_txvar.h>
 #else /* __FreeBSD__ */
+#include <sys/eventhandler.h>
 #include <net/if_mib.h>
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
diff --git a/sys/pci/if_vx_pci.c b/sys/pci/if_vx_pci.c
index 386ba42..e4910ad 100644
--- a/sys/pci/if_vx_pci.c
+++ b/sys/pci/if_vx_pci.c
@@ -34,6 +34,7 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/eventhandler.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>