From 04adadcd861b26c171f0563a679deaeb15b0533a Mon Sep 17 00:00:00 2001 From: mpi Date: Mon, 11 Aug 2014 12:45:45 +0000 Subject: [PATCH] Fewer --- sys/dev/cardbus/if_fxp_cardbus.c | 6 +----- sys/dev/cardbus/if_re_cardbus.c | 6 +----- sys/dev/cardbus/if_rl_cardbus.c | 6 +----- sys/dev/cardbus/if_xl_cardbus.c | 6 +----- sys/dev/eisa/if_ep_eisa.c | 8 ++------ sys/dev/isa/if_ec.c | 6 +----- sys/dev/isa/if_ef_isapnp.c | 6 +----- sys/dev/isa/if_eg.c | 6 +----- sys/dev/isa/if_el.c | 6 +----- sys/dev/isa/if_ep_isa.c | 6 +----- sys/dev/isa/if_ep_isapnp.c | 6 +----- sys/dev/isa/if_ie.c | 6 +----- sys/dev/isa/if_lc_isa.c | 6 +----- sys/dev/isa/if_ne_isa.c | 6 +----- sys/dev/isa/if_ne_isapnp.c | 6 +----- sys/dev/isa/if_sm_isa.c | 6 +----- sys/dev/isa/if_we.c | 6 +----- sys/dev/pcmcia/if_cnw.c | 6 +----- sys/dev/pcmcia/if_ep_pcmcia.c | 6 +----- sys/dev/pcmcia/if_malo.c | 3 +-- sys/dev/pcmcia/if_sm_pcmcia.c | 6 +----- sys/dev/pcmcia/if_xe.c | 6 +----- sys/dev/sbus/be.c | 6 +----- sys/dev/sbus/if_gem_sbus.c | 6 +----- sys/dev/sbus/if_hme_sbus.c | 6 +----- sys/dev/sbus/if_ti_sbus.c | 6 +----- sys/dev/sbus/qe.c | 6 +----- 27 files changed, 28 insertions(+), 133 deletions(-) diff --git a/sys/dev/cardbus/if_fxp_cardbus.c b/sys/dev/cardbus/if_fxp_cardbus.c index cd2c1cb3004..7768906b564 100644 --- a/sys/dev/cardbus/if_fxp_cardbus.c +++ b/sys/dev/cardbus/if_fxp_cardbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_fxp_cardbus.c,v 1.32 2013/12/06 21:03:02 deraadt Exp $ */ +/* $OpenBSD: if_fxp_cardbus.c,v 1.33 2014/08/11 12:45:45 mpi Exp $ */ /* $NetBSD: if_fxp_cardbus.c,v 1.12 2000/05/08 18:23:36 thorpej Exp $ */ /* @@ -58,12 +58,8 @@ #include #endif -#ifdef INET #include -#include -#include #include -#endif #include #include diff --git a/sys/dev/cardbus/if_re_cardbus.c b/sys/dev/cardbus/if_re_cardbus.c index f46bfa73bf7..1a6456846dc 100644 --- a/sys/dev/cardbus/if_re_cardbus.c +++ b/sys/dev/cardbus/if_re_cardbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_re_cardbus.c,v 1.23 2013/08/07 01:06:26 bluhm Exp $ */ +/* $OpenBSD: if_re_cardbus.c,v 1.24 2014/08/11 12:45:45 mpi Exp $ */ /* * Copyright (c) 2005 Peter Valchev @@ -35,12 +35,8 @@ #include #include -#ifdef INET #include -#include -#include #include -#endif #include #include diff --git a/sys/dev/cardbus/if_rl_cardbus.c b/sys/dev/cardbus/if_rl_cardbus.c index 45fba73346e..b8e43c0aa5d 100644 --- a/sys/dev/cardbus/if_rl_cardbus.c +++ b/sys/dev/cardbus/if_rl_cardbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_rl_cardbus.c,v 1.25 2013/08/07 01:06:26 bluhm Exp $ */ +/* $OpenBSD: if_rl_cardbus.c,v 1.26 2014/08/11 12:45:45 mpi Exp $ */ /* $NetBSD: if_rl_cardbus.c,v 1.3.8.3 2001/11/14 19:14:02 nathanw Exp $ */ /* @@ -60,12 +60,8 @@ #include #endif -#ifdef INET #include -#include -#include #include -#endif #include #include diff --git a/sys/dev/cardbus/if_xl_cardbus.c b/sys/dev/cardbus/if_xl_cardbus.c index 7c4b50b242b..5326d6123da 100644 --- a/sys/dev/cardbus/if_xl_cardbus.c +++ b/sys/dev/cardbus/if_xl_cardbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_xl_cardbus.c,v 1.28 2013/08/07 01:06:27 bluhm Exp $ */ +/* $OpenBSD: if_xl_cardbus.c,v 1.29 2014/08/11 12:45:45 mpi Exp $ */ /* $NetBSD: if_xl_cardbus.c,v 1.13 2000/03/07 00:32:52 mycroft Exp $ */ /* @@ -49,12 +49,8 @@ #include #include -#ifdef INET #include -#include -#include #include -#endif #include #include diff --git a/sys/dev/eisa/if_ep_eisa.c b/sys/dev/eisa/if_ep_eisa.c index a863d976232..5e57d25013f 100644 --- a/sys/dev/eisa/if_ep_eisa.c +++ b/sys/dev/eisa/if_ep_eisa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ep_eisa.c,v 1.23 2013/08/07 01:06:27 bluhm Exp $ */ +/* $OpenBSD: if_ep_eisa.c,v 1.24 2014/08/11 12:45:45 mpi Exp $ */ /* $NetBSD: if_ep_eisa.c,v 1.13 1997/04/18 00:50:33 cgd Exp $ */ /* @@ -51,12 +51,8 @@ #include #include -#ifdef INET #include -#include -#include -#include -#endif +#include #if NBPFILTER > 0 #include diff --git a/sys/dev/isa/if_ec.c b/sys/dev/isa/if_ec.c index 1e6eec6a613..8b85b9167ac 100644 --- a/sys/dev/isa/if_ec.c +++ b/sys/dev/isa/if_ec.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ec.c,v 1.12 2013/08/07 01:06:31 bluhm Exp $ */ +/* $OpenBSD: if_ec.c,v 1.13 2014/08/11 12:45:45 mpi Exp $ */ /* $NetBSD: if_ec.c,v 1.9 1998/07/05 06:49:12 jonathan Exp $ */ /*- @@ -62,12 +62,8 @@ #include #include -#ifdef INET #include -#include -#include #include -#endif #if NBPFILTER > 0 #include diff --git a/sys/dev/isa/if_ef_isapnp.c b/sys/dev/isa/if_ef_isapnp.c index 2f47a3f446b..b05ac5e07aa 100644 --- a/sys/dev/isa/if_ef_isapnp.c +++ b/sys/dev/isa/if_ef_isapnp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ef_isapnp.c,v 1.25 2013/08/07 01:06:31 bluhm Exp $ */ +/* $OpenBSD: if_ef_isapnp.c,v 1.26 2014/08/11 12:45:45 mpi Exp $ */ /* * Copyright (c) 1999 Jason L. Wright (jason@thought.net) @@ -47,12 +47,8 @@ #include #include -#ifdef INET #include -#include -#include #include -#endif #if NBPFILTER > 0 #include diff --git a/sys/dev/isa/if_eg.c b/sys/dev/isa/if_eg.c index d57413b5c3e..e5f08fbc0d4 100644 --- a/sys/dev/isa/if_eg.c +++ b/sys/dev/isa/if_eg.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_eg.c,v 1.34 2013/11/15 16:46:27 brad Exp $ */ +/* $OpenBSD: if_eg.c,v 1.35 2014/08/11 12:45:45 mpi Exp $ */ /* $NetBSD: if_eg.c,v 1.26 1996/05/12 23:52:27 mycroft Exp $ */ /* @@ -56,12 +56,8 @@ #include #include -#ifdef INET #include -#include -#include #include -#endif #if NBPFILTER > 0 #include diff --git a/sys/dev/isa/if_el.c b/sys/dev/isa/if_el.c index 537ac5bef14..ad82170a1af 100644 --- a/sys/dev/isa/if_el.c +++ b/sys/dev/isa/if_el.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_el.c,v 1.22 2013/08/07 01:06:32 bluhm Exp $ */ +/* $OpenBSD: if_el.c,v 1.23 2014/08/11 12:45:45 mpi Exp $ */ /* $NetBSD: if_el.c,v 1.39 1996/05/12 23:52:32 mycroft Exp $ */ /* @@ -34,12 +34,8 @@ #include #include -#ifdef INET #include -#include -#include #include -#endif #if NBPFILTER > 0 #include diff --git a/sys/dev/isa/if_ep_isa.c b/sys/dev/isa/if_ep_isa.c index 1607bafd7f8..2ed6c26fd8e 100644 --- a/sys/dev/isa/if_ep_isa.c +++ b/sys/dev/isa/if_ep_isa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ep_isa.c,v 1.27 2013/11/15 16:46:27 brad Exp $ */ +/* $OpenBSD: if_ep_isa.c,v 1.28 2014/08/11 12:45:45 mpi Exp $ */ /* $NetBSD: if_ep_isa.c,v 1.5 1996/05/12 23:52:36 mycroft Exp $ */ /* @@ -56,12 +56,8 @@ #include #include -#ifdef INET #include -#include -#include #include -#endif #if NBPFILTER > 0 #include diff --git a/sys/dev/isa/if_ep_isapnp.c b/sys/dev/isa/if_ep_isapnp.c index eda3943bc83..9e2a44c1868 100644 --- a/sys/dev/isa/if_ep_isapnp.c +++ b/sys/dev/isa/if_ep_isapnp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ep_isapnp.c,v 1.13 2013/11/15 16:46:27 brad Exp $ */ +/* $OpenBSD: if_ep_isapnp.c,v 1.14 2014/08/11 12:45:45 mpi Exp $ */ /* $NetBSD: if_ep_isapnp.c,v 1.5 1996/05/12 23:52:36 mycroft Exp $ */ /* @@ -56,12 +56,8 @@ #include #include -#ifdef INET #include -#include -#include #include -#endif #if NBPFILTER > 0 #include diff --git a/sys/dev/isa/if_ie.c b/sys/dev/isa/if_ie.c index e33529b6f3b..e1391454c6c 100644 --- a/sys/dev/isa/if_ie.c +++ b/sys/dev/isa/if_ie.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ie.c,v 1.38 2013/11/26 09:50:33 mpi Exp $ */ +/* $OpenBSD: if_ie.c,v 1.39 2014/08/11 12:45:45 mpi Exp $ */ /* $NetBSD: if_ie.c,v 1.51 1996/05/12 23:52:48 mycroft Exp $ */ /*- @@ -130,12 +130,8 @@ iomem, and to make 16-pointers, we subtract sc_maddr and and with 0xffff. #include #endif -#ifdef INET #include -#include -#include #include -#endif #include #include diff --git a/sys/dev/isa/if_lc_isa.c b/sys/dev/isa/if_lc_isa.c index d650457f547..f7033f89082 100644 --- a/sys/dev/isa/if_lc_isa.c +++ b/sys/dev/isa/if_lc_isa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_lc_isa.c,v 1.10 2013/08/07 01:06:32 bluhm Exp $ */ +/* $OpenBSD: if_lc_isa.c,v 1.11 2014/08/11 12:45:45 mpi Exp $ */ /* $NetBSD: if_lc_isa.c,v 1.10 2001/06/13 10:46:03 wiz Exp $ */ /*- @@ -50,12 +50,8 @@ #include #include -#ifdef INET #include -#include -#include #include -#endif #if NBPFILTER > 0 #include diff --git a/sys/dev/isa/if_ne_isa.c b/sys/dev/isa/if_ne_isa.c index 552bebc1681..86b46410bb7 100644 --- a/sys/dev/isa/if_ne_isa.c +++ b/sys/dev/isa/if_ne_isa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ne_isa.c,v 1.14 2013/08/07 01:06:32 bluhm Exp $ */ +/* $OpenBSD: if_ne_isa.c,v 1.15 2014/08/11 12:45:45 mpi Exp $ */ /* $NetBSD: if_ne_isa.c,v 1.6 1998/07/05 06:49:13 jonathan Exp $ */ /*- @@ -47,12 +47,8 @@ #include #include -#ifdef INET #include -#include -#include #include -#endif #if NBPFILTER > 0 #include diff --git a/sys/dev/isa/if_ne_isapnp.c b/sys/dev/isa/if_ne_isapnp.c index 07772f68c52..cdd364cac12 100644 --- a/sys/dev/isa/if_ne_isapnp.c +++ b/sys/dev/isa/if_ne_isapnp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ne_isapnp.c,v 1.13 2013/08/07 01:06:32 bluhm Exp $ */ +/* $OpenBSD: if_ne_isapnp.c,v 1.14 2014/08/11 12:45:45 mpi Exp $ */ /* $NetBSD: if_ne_isapnp.c,v 1.7 1998/07/23 19:30:45 christos Exp $ */ /*- @@ -47,12 +47,8 @@ #include #include -#ifdef INET #include -#include -#include #include -#endif #if NBPFILTER > 0 #include diff --git a/sys/dev/isa/if_sm_isa.c b/sys/dev/isa/if_sm_isa.c index f9ceb63f04f..7145d6308a4 100644 --- a/sys/dev/isa/if_sm_isa.c +++ b/sys/dev/isa/if_sm_isa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_sm_isa.c,v 1.11 2013/08/07 01:06:33 bluhm Exp $ */ +/* $OpenBSD: if_sm_isa.c,v 1.12 2014/08/11 12:45:45 mpi Exp $ */ /* $NetBSD: if_sm_isa.c,v 1.4 1998/07/05 06:49:14 jonathan Exp $ */ /*- @@ -48,12 +48,8 @@ #include #include -#ifdef INET #include -#include -#include #include -#endif #if NBPFILTER > 0 #include diff --git a/sys/dev/isa/if_we.c b/sys/dev/isa/if_we.c index a3628057230..d48f49fb271 100644 --- a/sys/dev/isa/if_we.c +++ b/sys/dev/isa/if_we.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_we.c,v 1.22 2013/08/07 01:06:33 bluhm Exp $ */ +/* $OpenBSD: if_we.c,v 1.23 2014/08/11 12:45:45 mpi Exp $ */ /* $NetBSD: if_we.c,v 1.11 1998/07/05 06:49:14 jonathan Exp $ */ /*- @@ -64,12 +64,8 @@ #include #include -#ifdef INET #include -#include -#include #include -#endif #if NBPFILTER > 0 #include diff --git a/sys/dev/pcmcia/if_cnw.c b/sys/dev/pcmcia/if_cnw.c index cfa75333c61..d4b987966ac 100644 --- a/sys/dev/pcmcia/if_cnw.c +++ b/sys/dev/pcmcia/if_cnw.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_cnw.c,v 1.24 2013/08/07 01:06:39 bluhm Exp $ */ +/* $OpenBSD: if_cnw.c,v 1.25 2014/08/11 12:45:45 mpi Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. * All rights reserved. @@ -68,12 +68,8 @@ #include #include -#ifdef INET #include -#include -#include #include -#endif #if NBPFILTER > 0 #include diff --git a/sys/dev/pcmcia/if_ep_pcmcia.c b/sys/dev/pcmcia/if_ep_pcmcia.c index dcc55a0dbf8..282bc713af8 100644 --- a/sys/dev/pcmcia/if_ep_pcmcia.c +++ b/sys/dev/pcmcia/if_ep_pcmcia.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ep_pcmcia.c,v 1.43 2014/05/04 20:09:15 sf Exp $ */ +/* $OpenBSD: if_ep_pcmcia.c,v 1.44 2014/08/11 12:45:45 mpi Exp $ */ /* $NetBSD: if_ep_pcmcia.c,v 1.16 1998/08/17 23:20:40 thorpej Exp $ */ /*- @@ -79,12 +79,8 @@ #include #include -#ifdef INET #include -#include -#include #include -#endif #if NBPFILTER > 0 #include diff --git a/sys/dev/pcmcia/if_malo.c b/sys/dev/pcmcia/if_malo.c index 7767e016211..cc6f945ef52 100644 --- a/sys/dev/pcmcia/if_malo.c +++ b/sys/dev/pcmcia/if_malo.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_malo.c,v 1.78 2014/07/12 18:48:52 tedu Exp $ */ +/* $OpenBSD: if_malo.c,v 1.79 2014/08/11 12:45:45 mpi Exp $ */ /* * Copyright (c) 2007 Marcus Glocker @@ -40,7 +40,6 @@ #include #include -#include #include #include diff --git a/sys/dev/pcmcia/if_sm_pcmcia.c b/sys/dev/pcmcia/if_sm_pcmcia.c index 9a2aff23b65..5c2ecdfccde 100644 --- a/sys/dev/pcmcia/if_sm_pcmcia.c +++ b/sys/dev/pcmcia/if_sm_pcmcia.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_sm_pcmcia.c,v 1.33 2013/08/07 01:06:40 bluhm Exp $ */ +/* $OpenBSD: if_sm_pcmcia.c,v 1.34 2014/08/11 12:45:45 mpi Exp $ */ /* $NetBSD: if_sm_pcmcia.c,v 1.11 1998/08/15 20:47:32 thorpej Exp $ */ /*- @@ -48,12 +48,8 @@ #include #include -#ifdef INET #include -#include -#include #include -#endif #if NBPFILTER > 0 #include diff --git a/sys/dev/pcmcia/if_xe.c b/sys/dev/pcmcia/if_xe.c index 6f48ccf51e3..ee33dd61c2d 100644 --- a/sys/dev/pcmcia/if_xe.c +++ b/sys/dev/pcmcia/if_xe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_xe.c,v 1.44 2014/07/12 18:48:52 tedu Exp $ */ +/* $OpenBSD: if_xe.c,v 1.45 2014/08/11 12:45:45 mpi Exp $ */ /* * Copyright (c) 1999 Niklas Hallqvist, Brandon Creighton, Job de Haas @@ -61,12 +61,8 @@ #include #include -#ifdef INET #include -#include -#include #include -#endif #if NBPFILTER > 0 #include diff --git a/sys/dev/sbus/be.c b/sys/dev/sbus/be.c index c2fc2fa53a3..b33b3add5f8 100644 --- a/sys/dev/sbus/be.c +++ b/sys/dev/sbus/be.c @@ -1,4 +1,4 @@ -/* $OpenBSD: be.c,v 1.26 2013/11/26 09:50:33 mpi Exp $ */ +/* $OpenBSD: be.c,v 1.27 2014/08/11 12:45:45 mpi Exp $ */ /* $NetBSD: be.c,v 1.26 2001/03/20 15:39:20 pk Exp $ */ /*- @@ -75,12 +75,8 @@ #include #include -#ifdef INET #include -#include -#include #include -#endif #if NBPFILTER > 0 #include diff --git a/sys/dev/sbus/if_gem_sbus.c b/sys/dev/sbus/if_gem_sbus.c index 1625a6489d1..14a1273c97f 100644 --- a/sys/dev/sbus/if_gem_sbus.c +++ b/sys/dev/sbus/if_gem_sbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_gem_sbus.c,v 1.7 2013/08/07 01:06:40 bluhm Exp $ */ +/* $OpenBSD: if_gem_sbus.c,v 1.8 2014/08/11 12:45:45 mpi Exp $ */ /* $NetBSD: if_gem_sbus.c,v 1.1 2006/11/24 13:23:32 martin Exp $ */ /*- @@ -45,12 +45,8 @@ #include #include -#ifdef INET #include -#include -#include #include -#endif #include #include diff --git a/sys/dev/sbus/if_hme_sbus.c b/sys/dev/sbus/if_hme_sbus.c index 99fc0c1d5a5..cc99f9b6b24 100644 --- a/sys/dev/sbus/if_hme_sbus.c +++ b/sys/dev/sbus/if_hme_sbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_hme_sbus.c,v 1.14 2013/08/07 01:06:40 bluhm Exp $ */ +/* $OpenBSD: if_hme_sbus.c,v 1.15 2014/08/11 12:45:45 mpi Exp $ */ /* $NetBSD: if_hme_sbus.c,v 1.6 2001/02/28 14:52:48 mrg Exp $ */ /*- @@ -45,12 +45,8 @@ #include #include -#ifdef INET #include -#include -#include #include -#endif #include #include diff --git a/sys/dev/sbus/if_ti_sbus.c b/sys/dev/sbus/if_ti_sbus.c index f0869d13a9c..859a870c501 100644 --- a/sys/dev/sbus/if_ti_sbus.c +++ b/sys/dev/sbus/if_ti_sbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ti_sbus.c,v 1.2 2013/08/07 01:06:40 bluhm Exp $ */ +/* $OpenBSD: if_ti_sbus.c,v 1.3 2014/08/11 12:45:45 mpi Exp $ */ /* * Copyright (c) 2009 Mark Kettenis * @@ -24,12 +24,8 @@ #include #include -#ifdef INET #include -#include -#include #include -#endif #include #include diff --git a/sys/dev/sbus/qe.c b/sys/dev/sbus/qe.c index ec17c7f05f4..eb501c0837f 100644 --- a/sys/dev/sbus/qe.c +++ b/sys/dev/sbus/qe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: qe.c,v 1.25 2013/11/26 09:50:33 mpi Exp $ */ +/* $OpenBSD: qe.c,v 1.26 2014/08/11 12:45:45 mpi Exp $ */ /* $NetBSD: qe.c,v 1.16 2001/03/30 17:30:18 christos Exp $ */ /*- @@ -85,12 +85,8 @@ #include #include -#ifdef INET #include -#include -#include #include -#endif #if NBPFILTER > 0 #include -- 2.20.1