From 7bd3a67fb678bfbc77517f7f80fd0ed270b0a9ab Mon Sep 17 00:00:00 2001 From: Arnaldo Carvalho de Melo Date: Thu, 21 Nov 2002 16:06:18 -0200 Subject: [PATCH] o drivers/net: fix up header cleanup: remove unneeded sched.h includes --- drivers/net/appletalk/cops.c | 13 +++++-------- drivers/net/appletalk/ltpc.c | 14 +++++--------- drivers/net/cs89x0.c | 13 ++++++------- drivers/net/de600.c | 6 ++---- drivers/net/de620.c | 8 +++----- drivers/net/declance.c | 1 - drivers/net/defxx.c | 8 +++----- drivers/net/depca.c | 13 +++++-------- drivers/net/dgrs.c | 1 - drivers/net/e2100.c | 2 -- drivers/net/eepro.c | 11 +++++------ drivers/net/eexpress.c | 13 +++++-------- drivers/net/es3210.c | 6 +++--- drivers/net/eth16i.c | 3 --- drivers/net/ewrk3.c | 13 +++++-------- drivers/net/fc/iph5526.c | 13 +++++++------ drivers/net/fealnx.c | 2 +- drivers/net/fec.c | 2 +- drivers/net/fmv18x.c | 12 +++++------- drivers/net/gt96100eth.c | 2 +- drivers/net/hamachi.c | 12 +++++------- drivers/net/hamradio/baycom_par.c | 8 ++++---- drivers/net/hamradio/scc.c | 12 +++++------- drivers/net/hp-plus.c | 2 -- drivers/net/hp.c | 2 -- drivers/net/hp100.c | 8 +++----- drivers/net/hplance.c | 11 ++++------- drivers/net/hydra.c | 2 -- drivers/net/ibmlana.c | 10 ++++------ drivers/net/irda/act200l.c | 1 - drivers/net/irda/actisys.c | 1 - drivers/net/irda/ep7211_ir.c | 1 - drivers/net/irda/esi.c | 2 -- drivers/net/irda/girbil.c | 1 - drivers/net/irda/litelink.c | 1 - drivers/net/irda/ma600.c | 1 - drivers/net/irda/mcp2120.c | 1 - drivers/net/irda/old_belkin.c | 1 - drivers/net/irda/sir_kthread.c | 1 - drivers/net/irda/tekram.c | 1 - drivers/net/isa-skeleton.c | 12 +++++------- drivers/net/jazzsonic.c | 11 +++++------ drivers/net/lance.c | 9 ++++----- drivers/net/lasi_82596.c | 3 --- drivers/net/lne390.c | 5 ++--- drivers/net/lp486e.c | 1 - drivers/net/mac8390.c | 13 ++++++------- drivers/net/mac89x0.c | 12 ++++++------ drivers/net/macsonic.c | 14 ++++++-------- drivers/net/mvme147.c | 10 +++------- drivers/net/myri_sbus.c | 24 +++++++++--------------- drivers/net/ne.c | 7 ++++--- drivers/net/ne2.c | 13 +++++-------- drivers/net/ne2k-pci.c | 6 +++--- drivers/net/ne3210.c | 6 +++--- drivers/net/net_init.c | 1 - drivers/net/ni65.c | 10 ++++------ drivers/net/pcmcia/3c574_cs.c | 11 +++++------ drivers/net/pcmcia/3c589_cs.c | 12 +++++------- drivers/net/pcmcia/aironet4500_cs.c | 14 +++++--------- drivers/net/pcmcia/axnet_cs.c | 11 +++++------ drivers/net/pcmcia/com20020_cs.c | 7 +++---- drivers/net/pcmcia/fmvj18x_cs.c | 10 ++++------ drivers/net/pcmcia/ibmtr_cs.c | 9 ++++----- drivers/net/pcmcia/nmclan_cs.c | 12 +++++------- drivers/net/pcmcia/pcnet_cs.c | 11 +++++------ drivers/net/pcmcia/ray_cs.c | 12 +++++------- drivers/net/pcmcia/smc91c92_cs.c | 9 ++++----- drivers/net/pcmcia/xirc2ps_cs.c | 11 +++++------ drivers/net/pcnet32.c | 12 +++++------- drivers/net/plip.c | 12 +++++------- drivers/net/pppoe.c | 8 ++------ drivers/net/pppox.c | 10 ++++------ drivers/net/rcpci45.c | 2 +- drivers/net/sb1000.c | 13 ++++--------- drivers/net/seeq8005.c | 10 +++++----- drivers/net/sgiseeq.c | 18 +++++++----------- drivers/net/shaper.c | 4 ++-- drivers/net/sis900.c | 1 - drivers/net/sk_g16.c | 9 ++++----- drivers/net/sk_mca.c | 10 ++++------ drivers/net/skfp/skfddi.c | 12 +++++------- drivers/net/slhc.c | 1 - drivers/net/smc-mca.c | 10 ++++------ drivers/net/smc-ultra.c | 7 +++---- drivers/net/smc-ultra32.c | 6 +++--- drivers/net/smc9194.c | 8 ++++---- drivers/net/stnic.c | 4 ++-- drivers/net/sun3lance.c | 10 +++------- drivers/net/sunbmac.c | 22 ++++++++++------------ drivers/net/sungem.c | 3 --- drivers/net/sunhme.c | 12 +++++------- drivers/net/sunlance.c | 19 +++++++------------ drivers/net/sunqe.c | 12 ++++-------- drivers/net/tc35815.c | 13 +++++-------- drivers/net/tokenring/3c359.c | 3 +-- drivers/net/tokenring/abyss.c | 5 ++--- drivers/net/tokenring/ibmtr.c | 2 +- drivers/net/tokenring/lanstreamer.c | 3 +-- drivers/net/tokenring/madgemc.c | 5 ++--- drivers/net/tokenring/olympic.c | 3 +-- drivers/net/tokenring/smctr.c | 13 ++++++------- drivers/net/tokenring/tms380tr.c | 16 +++++++--------- drivers/net/tokenring/tmsisa.c | 5 ++--- drivers/net/tokenring/tmspci.c | 5 ++--- drivers/net/tulip/de2104x.c | 2 +- drivers/net/tulip/de4x5.c | 18 +++++++----------- drivers/net/tulip/dmfe.c | 2 -- drivers/net/tulip/xircom_cb.c | 5 +---- drivers/net/tun.c | 3 --- drivers/net/wan/comx-hw-comx.c | 2 +- drivers/net/wan/comx-hw-locomx.c | 7 ++++--- drivers/net/wan/comx-hw-mixcom.c | 9 +++++---- drivers/net/wan/comx-hw-munich.c | 8 ++++---- drivers/net/wan/comx-proto-fr.c | 1 + drivers/net/wan/cosa.c | 1 - drivers/net/wan/dlci.c | 15 ++++++--------- drivers/net/wan/hdlc_cisco.c | 1 - drivers/net/wan/hdlc_fr.c | 1 - drivers/net/wan/hdlc_generic.c | 1 - drivers/net/wan/hdlc_ppp.c | 1 - drivers/net/wan/hdlc_raw.c | 1 - drivers/net/wan/hdlc_x25.c | 1 - drivers/net/wan/n2.c | 1 - drivers/net/wan/pc300_drv.c | 5 +++-- drivers/net/wan/pc300_tty.c | 7 +++---- drivers/net/wan/sbni.c | 20 ++++++++------------ drivers/net/wan/sdla.c | 14 +++++--------- drivers/net/wan/syncppp.c | 7 ++++--- drivers/net/wd.c | 8 ++++---- drivers/net/wireless/airo_cs.c | 8 +++----- drivers/net/wireless/airport.c | 9 ++++----- drivers/net/wireless/netwave_cs.c | 12 +++++------- drivers/net/wireless/orinoco.c | 8 ++++---- drivers/net/wireless/orinoco_cs.c | 8 ++++---- drivers/net/wireless/orinoco_pci.c | 8 ++++---- drivers/net/znet.c | 11 +++++------ 137 files changed, 416 insertions(+), 618 deletions(-) diff --git a/drivers/net/appletalk/cops.c b/drivers/net/appletalk/cops.c index d22280e0d157..5aee3839317b 100644 --- a/drivers/net/appletalk/cops.c +++ b/drivers/net/appletalk/cops.c @@ -50,9 +50,7 @@ static const char *version = #include #include - #include -#include #include #include #include @@ -61,22 +59,21 @@ static const char *version = #include #include #include -#include -#include -#include -#include #include #include - #include #include #include - #include #include /* For ltalk_setup() */ #include /* For udelay() */ #include +#include +#include +#include +#include + #include "cops.h" /* Our Stuff */ #include "cops_ltdrv.h" /* Firmware code for Tangent type cards. */ #include "cops_ffdrv.h" /* Firmware code for Dayna type cards. */ diff --git a/drivers/net/appletalk/ltpc.c b/drivers/net/appletalk/ltpc.c index ecd214ade328..bf566d8e911d 100644 --- a/drivers/net/appletalk/ltpc.c +++ b/drivers/net/appletalk/ltpc.c @@ -208,7 +208,6 @@ static int dma; #include #include -#include #include #include #include @@ -217,25 +216,22 @@ static int dma; #include #include #include -#include -#include -#include -#include #include #include - #include #include #include - #include #include - #include #include - #include +#include +#include +#include +#include + /* our stuff */ #include "ltpc.h" diff --git a/drivers/net/cs89x0.c b/drivers/net/cs89x0.c index 6fb744d36b5e..759b4ec37889 100644 --- a/drivers/net/cs89x0.c +++ b/drivers/net/cs89x0.c @@ -115,28 +115,27 @@ */ +#include +#include +#include #include -#include #include #include #include #include #include +#include #include +#include #include #include + #include #include #include #if ALLOW_DMA #include #endif -#include -#include - -#include -#include -#include #include "cs89x0.h" diff --git a/drivers/net/de600.c b/drivers/net/de600.c index f308dae5caca..f0236fac3520 100644 --- a/drivers/net/de600.c +++ b/drivers/net/de600.c @@ -54,26 +54,24 @@ static const char version[] = "de600.c: $Revision: 1.41-2.5 $, Bjorn Ekwall (bj #endif #include - #include -#include #include #include #include #include #include -#include #include #include #include #include #include - #include #include #include #include +#include + #include "de600.h" static unsigned int de600_debug = DE600_DEBUG; diff --git a/drivers/net/de620.c b/drivers/net/de620.c index a385a2b17ff5..6f892b11c30a 100644 --- a/drivers/net/de620.c +++ b/drivers/net/de620.c @@ -117,25 +117,23 @@ static const char version[] = #endif #include - #include -#include #include #include #include #include #include -#include #include -#include #include #include - #include #include #include #include +#include +#include + /* Constant definitions for the DE-620 registers, commands and bits */ #include "de620.h" diff --git a/drivers/net/declance.c b/drivers/net/declance.c index 756b82959684..f78abc9baf29 100644 --- a/drivers/net/declance.c +++ b/drivers/net/declance.c @@ -67,7 +67,6 @@ static char *lancestr = "LANCE"; #include #include #include -#include #include #include #include diff --git a/drivers/net/defxx.c b/drivers/net/defxx.c index b9e6660d994c..caecb88097e5 100644 --- a/drivers/net/defxx.c +++ b/drivers/net/defxx.c @@ -204,9 +204,7 @@ /* Include files */ #include - #include -#include #include #include #include @@ -216,13 +214,13 @@ #include #include #include +#include +#include + #include #include #include -#include -#include - #include "defxx.h" /* Version information string - should be updated prior to each new release!!! */ diff --git a/drivers/net/depca.c b/drivers/net/depca.c index f9e8f29c0b22..9ea30cca00b7 100644 --- a/drivers/net/depca.c +++ b/drivers/net/depca.c @@ -236,9 +236,7 @@ #include #include - #include -#include #include #include #include @@ -247,20 +245,19 @@ #include #include #include -#include -#include -#include -#include - #include #include #include - #include #include #include #include +#include +#include +#include +#include + #ifdef CONFIG_MCA #include #endif diff --git a/drivers/net/dgrs.c b/drivers/net/dgrs.c index 114ba24bf3aa..af85f0dc3d0e 100644 --- a/drivers/net/dgrs.c +++ b/drivers/net/dgrs.c @@ -85,7 +85,6 @@ #include #include -#include #include #include #include diff --git a/drivers/net/e2100.c b/drivers/net/e2100.c index 31493d863982..e9ff7b327fa2 100644 --- a/drivers/net/e2100.c +++ b/drivers/net/e2100.c @@ -37,9 +37,7 @@ static const char version[] = "e2100.c:v1.01 7/21/94 Donald Becker (becker@cesdis.gsfc.nasa.gov)\n"; #include - #include -#include #include #include #include diff --git a/drivers/net/eepro.c b/drivers/net/eepro.c index d856368faa5c..76c11eaf3aa5 100644 --- a/drivers/net/eepro.c +++ b/drivers/net/eepro.c @@ -131,7 +131,6 @@ static const char version[] = */ #include -#include #include #include #include @@ -139,12 +138,7 @@ static const char version[] = #include #include #include -#include -#include -#include -#include #include - #include #include #include @@ -152,6 +146,11 @@ static const char version[] = #include #include +#include +#include +#include +#include + #define compat_dev_kfree_skb( skb, mode ) dev_kfree_skb( (skb) ) /* I had reports of looong delays with SLOW_DOWN defined as udelay(2) */ #define SLOW_DOWN inb(0x80) diff --git a/drivers/net/eexpress.c b/drivers/net/eexpress.c index a6f9251591d8..d61ffce57de2 100644 --- a/drivers/net/eexpress.c +++ b/drivers/net/eexpress.c @@ -99,31 +99,28 @@ #include #include - #include -#include #include #include #include #include #include #include -#include -#include -#include -#include #include #include #include - #include #include #include #include #include - #include +#include +#include +#include +#include + #ifndef NET_DEBUG #define NET_DEBUG 4 #endif diff --git a/drivers/net/es3210.c b/drivers/net/es3210.c index fa9ddc648790..96952230b132 100644 --- a/drivers/net/es3210.c +++ b/drivers/net/es3210.c @@ -50,15 +50,15 @@ static const char version[] = #include #include -#include #include #include #include +#include +#include + #include #include -#include -#include #include "8390.h" int es_probe(struct net_device *dev); diff --git a/drivers/net/eth16i.c b/drivers/net/eth16i.c index 08292e2ed7ca..5264ca2a7979 100644 --- a/drivers/net/eth16i.c +++ b/drivers/net/eth16i.c @@ -146,9 +146,7 @@ static char *version = "eth16i.c: v0.35 01-Jul-1999 Mika Kuoppala (miku@iki.fi)\n"; #include - #include -#include #include #include #include @@ -159,7 +157,6 @@ static char *version = #include #include #include - #include #include #include diff --git a/drivers/net/ewrk3.c b/drivers/net/ewrk3.c index 45a96208085d..dc51c05ee036 100644 --- a/drivers/net/ewrk3.c +++ b/drivers/net/ewrk3.c @@ -144,9 +144,7 @@ */ #include - #include -#include #include #include #include @@ -155,21 +153,20 @@ #include #include #include -#include -#include -#include -#include - #include #include #include #include - #include #include #include #include +#include +#include +#include +#include + #include "ewrk3.h" #define DRV_NAME "ewrk3" diff --git a/drivers/net/fc/iph5526.c b/drivers/net/fc/iph5526.c index eea62395d90e..59b7e5debf58 100644 --- a/drivers/net/fc/iph5526.c +++ b/drivers/net/fc/iph5526.c @@ -37,27 +37,28 @@ static const char *version = #include #include -#include #include #include #include +#include #include #include #include #include #include #include -#include -#include - #include -#include /* had the declarations for init_fcdev among others + includes if_fcdevice.h */ - #include +#include /* had the declarations for init_fcdev among + others + includes if_fcdevice.h */ + #include "../../scsi/scsi.h" #include "../../scsi/hosts.h" #include "../../fc4/fcp.h" +#include +#include + /* driver specific header files */ #include "tach.h" #include "tach_structs.h" diff --git a/drivers/net/fealnx.c b/drivers/net/fealnx.c index 09c3b278be04..bd2271fdb495 100644 --- a/drivers/net/fealnx.c +++ b/drivers/net/fealnx.c @@ -70,7 +70,6 @@ static int full_duplex[MAX_UNITS] = { -1, -1, -1, -1, -1, -1, -1, -1 }; /* Include files, designed to support most kernel versions 2.0.0 and later. */ #include #include -#include #include #include #include @@ -85,6 +84,7 @@ static int full_duplex[MAX_UNITS] = { -1, -1, -1, -1, -1, -1, -1, -1 }; #include #include #include + #include /* Processor type for cache alignment. */ #include #include diff --git a/drivers/net/fec.c b/drivers/net/fec.c index 82e32e299931..aae5158d3cb4 100644 --- a/drivers/net/fec.c +++ b/drivers/net/fec.c @@ -25,7 +25,6 @@ #include #include #include -#include #include #include #include @@ -40,6 +39,7 @@ #include #include #include + #include #include #include diff --git a/drivers/net/fmv18x.c b/drivers/net/fmv18x.c index ff9b750d6e7b..cafd4cbd136e 100644 --- a/drivers/net/fmv18x.c +++ b/drivers/net/fmv18x.c @@ -36,9 +36,7 @@ static const char version[] = "fmv18x.c:v2.2.0 09/24/98 Yutaka TAMIYA (tamy@flab.fujitsu.co.jp)\n"; #include - #include -#include #include #include #include @@ -47,18 +45,18 @@ static const char version[] = #include #include #include -#include -#include -#include -#include #include #include - #include #include #include #include +#include +#include +#include +#include + static int fmv18x_probe_list[] __initdata = { 0x220, 0x240, 0x260, 0x280, 0x2a0, 0x2c0, 0x300, 0x340, 0 }; diff --git a/drivers/net/gt96100eth.c b/drivers/net/gt96100eth.c index 6509b9cf667d..a82f99773a7f 100644 --- a/drivers/net/gt96100eth.c +++ b/drivers/net/gt96100eth.c @@ -46,7 +46,6 @@ #include #include -#include #include #include #include @@ -61,6 +60,7 @@ #include #include #include + #include #include #include diff --git a/drivers/net/hamachi.c b/drivers/net/hamachi.c index f19d12e61d6e..cc587104e524 100644 --- a/drivers/net/hamachi.c +++ b/drivers/net/hamachi.c @@ -154,7 +154,6 @@ static int tx_params[MAX_UNITS] = {-1, -1, -1, -1, -1, -1, -1, -1}; #include #include -#include #include #include #include @@ -166,6 +165,11 @@ static int tx_params[MAX_UNITS] = {-1, -1, -1, -1, -1, -1, -1, -1}; #include #include #include +#include +#include +#include +#include +#include #include #include /* Processor type for cache alignment. */ @@ -174,12 +178,6 @@ static int tx_params[MAX_UNITS] = {-1, -1, -1, -1, -1, -1, -1, -1}; #include #include -#include -#include -#include -#include -#include - static char version[] __initdata = KERN_INFO DRV_NAME ".c:v" DRV_VERSION " " DRV_RELDATE " Written by Donald Becker\n" KERN_INFO " Some modifications by Eric kasten \n" diff --git a/drivers/net/hamradio/baycom_par.c b/drivers/net/hamradio/baycom_par.c index 0ef5c0d77ea6..f36ba3e63c7c 100644 --- a/drivers/net/hamradio/baycom_par.c +++ b/drivers/net/hamradio/baycom_par.c @@ -71,16 +71,12 @@ #include #include #include -#include #include #include #include #include #include #include -#include -#include -#include #include #include #include @@ -89,6 +85,10 @@ #include #include +#include +#include +#include + /* --------------------------------------------------------------------- */ #define BAYCOM_DEBUG diff --git a/drivers/net/hamradio/scc.c b/drivers/net/hamradio/scc.c index 1d96f745d377..3487fac205e7 100644 --- a/drivers/net/hamradio/scc.c +++ b/drivers/net/hamradio/scc.c @@ -152,7 +152,6 @@ #include #include #include -#include #include #include #include @@ -162,27 +161,26 @@ #include #include #include - #include #include #include #include #include #include - #include -#include "z8530.h" +#include +#include +#include #include + #include #include #include #include #include -#include -#include -#include +#include "z8530.h" static char banner[] __initdata = KERN_INFO "AX.25: Z8530 SCC driver version "VERSION".dl1bke\n"; diff --git a/drivers/net/hp-plus.c b/drivers/net/hp-plus.c index f2beca53e430..8533f8a82595 100644 --- a/drivers/net/hp-plus.c +++ b/drivers/net/hp-plus.c @@ -25,7 +25,6 @@ static const char version[] = #include /* Important -- this inlines word moves. */ #include -#include #include #include #include @@ -36,7 +35,6 @@ static const char version[] = #include #include - #include "8390.h" /* A zero-terminated list of I/O addresses to be probed. */ diff --git a/drivers/net/hp.c b/drivers/net/hp.c index 6481e5411fb5..68f31dd7aa95 100644 --- a/drivers/net/hp.c +++ b/drivers/net/hp.c @@ -24,9 +24,7 @@ static const char version[] = #include - #include -#include #include #include #include diff --git a/drivers/net/hp100.c b/drivers/net/hp100.c index de55257a8c7f..a4c30177e7b2 100644 --- a/drivers/net/hp100.c +++ b/drivers/net/hp100.c @@ -99,7 +99,6 @@ #include #include #include -#include #include #include #include @@ -107,18 +106,17 @@ #include #include #include -#include -#include - #include #include #include - #include #include /* for CONFIG_PCI */ #include #include +#include +#include + #define LINUX_2_1 typedef struct net_device_stats hp100_stats_t; diff --git a/drivers/net/hplance.c b/drivers/net/hplance.c index 2e684c5b91b6..29aa6abced63 100644 --- a/drivers/net/hplance.c +++ b/drivers/net/hplance.c @@ -7,7 +7,6 @@ #include #include -#include #include #include #include @@ -16,20 +15,18 @@ #include #include #include -#include -#include -#include - /* Used for the temporal inet entries and routing */ #include #include - #include - #include #include #include +#include +#include +#include + #include "hplance.h" /* We have 16834 bytes of RAM for the init block and buffers. This places diff --git a/drivers/net/hydra.c b/drivers/net/hydra.c index bef663f555eb..45640b23027b 100644 --- a/drivers/net/hydra.c +++ b/drivers/net/hydra.c @@ -14,7 +14,6 @@ #include #include -#include #include #include #include @@ -28,7 +27,6 @@ #include #include #include - #include #include #include diff --git a/drivers/net/ibmlana.c b/drivers/net/ibmlana.c index 29c47557010f..de413082a37f 100644 --- a/drivers/net/ibmlana.c +++ b/drivers/net/ibmlana.c @@ -76,7 +76,6 @@ History: #include #include -#include #include #include #include @@ -85,16 +84,15 @@ History: #include #include #include -#include -#include -#include - #include - #include #include #include +#include +#include +#include + #define _IBM_LANA_DRIVER_ #include "ibmlana.h" diff --git a/drivers/net/irda/act200l.c b/drivers/net/irda/act200l.c index 865ac13e207a..cdc58c120018 100644 --- a/drivers/net/irda/act200l.c +++ b/drivers/net/irda/act200l.c @@ -21,7 +21,6 @@ #include #include #include -#include #include #include diff --git a/drivers/net/irda/actisys.c b/drivers/net/irda/actisys.c index ecabcf629f3d..dfa05c9d6974 100644 --- a/drivers/net/irda/actisys.c +++ b/drivers/net/irda/actisys.c @@ -38,7 +38,6 @@ #include #include #include -#include #include #include diff --git a/drivers/net/irda/ep7211_ir.c b/drivers/net/irda/ep7211_ir.c index 3288d8d97371..fd20005848c4 100644 --- a/drivers/net/irda/ep7211_ir.c +++ b/drivers/net/irda/ep7211_ir.c @@ -7,7 +7,6 @@ #include #include #include -#include #include #include diff --git a/drivers/net/irda/esi.c b/drivers/net/irda/esi.c index 90d9988728be..972f328c7c5b 100644 --- a/drivers/net/irda/esi.c +++ b/drivers/net/irda/esi.c @@ -31,10 +31,8 @@ ********************************************************************/ #include - #include #include -#include #include #include diff --git a/drivers/net/irda/girbil.c b/drivers/net/irda/girbil.c index 2124fcf1d25c..27e2c9886841 100644 --- a/drivers/net/irda/girbil.c +++ b/drivers/net/irda/girbil.c @@ -25,7 +25,6 @@ #include #include #include -#include #include #include diff --git a/drivers/net/irda/litelink.c b/drivers/net/irda/litelink.c index 943127c7ee85..2830a5b77475 100644 --- a/drivers/net/irda/litelink.c +++ b/drivers/net/irda/litelink.c @@ -31,7 +31,6 @@ #include #include #include -#include #include #include diff --git a/drivers/net/irda/ma600.c b/drivers/net/irda/ma600.c index 3a33e2cd0831..f1eb1c4a973d 100644 --- a/drivers/net/irda/ma600.c +++ b/drivers/net/irda/ma600.c @@ -37,7 +37,6 @@ #include #include #include -#include #include #include diff --git a/drivers/net/irda/mcp2120.c b/drivers/net/irda/mcp2120.c index 45edb0034061..4024f9d22b88 100644 --- a/drivers/net/irda/mcp2120.c +++ b/drivers/net/irda/mcp2120.c @@ -21,7 +21,6 @@ #include #include #include -#include #include #include diff --git a/drivers/net/irda/old_belkin.c b/drivers/net/irda/old_belkin.c index 1ad30691aaa8..d3ee62974f1c 100644 --- a/drivers/net/irda/old_belkin.c +++ b/drivers/net/irda/old_belkin.c @@ -31,7 +31,6 @@ #include #include #include -#include #include #include #include diff --git a/drivers/net/irda/sir_kthread.c b/drivers/net/irda/sir_kthread.c index c20f80d39a39..80fd4a071836 100644 --- a/drivers/net/irda/sir_kthread.c +++ b/drivers/net/irda/sir_kthread.c @@ -19,7 +19,6 @@ #include #include #include -#include #include diff --git a/drivers/net/irda/tekram.c b/drivers/net/irda/tekram.c index 6fbfa45ecdb4..b4e76f4ef8d7 100644 --- a/drivers/net/irda/tekram.c +++ b/drivers/net/irda/tekram.c @@ -25,7 +25,6 @@ #include #include #include -#include #include #include diff --git a/drivers/net/isa-skeleton.c b/drivers/net/isa-skeleton.c index c07a86f32957..8e306ac48d89 100644 --- a/drivers/net/isa-skeleton.c +++ b/drivers/net/isa-skeleton.c @@ -41,9 +41,7 @@ static const char *version = */ #include - #include -#include #include #include #include @@ -51,18 +49,18 @@ static const char *version = #include #include #include -#include -#include #include -#include -#include #include #include - #include #include #include +#include +#include +#include +#include + /* * The name of the card. Is used for messages and in the requests for * io regions, irqs and dma channels diff --git a/drivers/net/jazzsonic.c b/drivers/net/jazzsonic.c index 17e3e178162f..c554db39ee03 100644 --- a/drivers/net/jazzsonic.c +++ b/drivers/net/jazzsonic.c @@ -14,7 +14,6 @@ */ #include -#include #include #include #include @@ -24,6 +23,11 @@ #include #include #include +#include +#include +#include +#include + #include #include #include @@ -32,11 +36,6 @@ #include #include #include -#include - -#include -#include -#include #define SREGS_PAD(n) u16 n; diff --git a/drivers/net/lance.c b/drivers/net/lance.c index 1c8185c49be8..539338697b71 100644 --- a/drivers/net/lance.c +++ b/drivers/net/lance.c @@ -43,7 +43,6 @@ static const char version[] = "lance.c:v1.15ac 1999/11/13 dplatt@3do.com, becker #include #include -#include #include #include #include @@ -51,14 +50,14 @@ static const char version[] = "lance.c:v1.15ac 1999/11/13 dplatt@3do.com, becker #include #include #include -#include -#include -#include - #include #include #include +#include +#include +#include + static unsigned int lance_portlist[] __initdata = { 0x300, 0x320, 0x340, 0x360, 0}; int lance_probe(struct net_device *dev); static int lance_probe1(struct net_device *dev, int ioaddr, int irq, int options); diff --git a/drivers/net/lasi_82596.c b/drivers/net/lasi_82596.c index 1c0ec4b8b5b7..fa38799dd727 100644 --- a/drivers/net/lasi_82596.c +++ b/drivers/net/lasi_82596.c @@ -69,9 +69,7 @@ */ #include - #include -#include #include #include #include @@ -91,7 +89,6 @@ #include #include #include - #include #include diff --git a/drivers/net/lne390.c b/drivers/net/lne390.c index c18997bbfcc7..ed77dcfeab1f 100644 --- a/drivers/net/lne390.c +++ b/drivers/net/lne390.c @@ -36,17 +36,16 @@ static const char *version = #include #include -#include #include #include #include #include +#include +#include #include #include -#include -#include #include "8390.h" int lne390_probe(struct net_device *dev); diff --git a/drivers/net/lp486e.c b/drivers/net/lp486e.c index d4db99115aca..d677e1832497 100644 --- a/drivers/net/lp486e.c +++ b/drivers/net/lp486e.c @@ -62,7 +62,6 @@ All other communication is through memory! #include #include #include -#include #include #include #include diff --git a/drivers/net/mac8390.c b/drivers/net/mac8390.c index 0608cb442a37..c6255c3b8f21 100644 --- a/drivers/net/mac8390.c +++ b/drivers/net/mac8390.c @@ -17,9 +17,7 @@ #include #include - #include -#include #include #include #include @@ -29,18 +27,19 @@ #include #include #include +#include +#include +#include +#include +#include + #include #include #include #include #include #include -#include -#include -#include -#include -#include #include "8390.h" #if (LINUX_VERSION_CODE < 0x02030e) diff --git a/drivers/net/mac89x0.c b/drivers/net/mac89x0.c index ecc7d468ccf2..ba9adba053a0 100644 --- a/drivers/net/mac89x0.c +++ b/drivers/net/mac89x0.c @@ -84,7 +84,6 @@ static char *version = */ #include -#include #include #include #include @@ -93,17 +92,18 @@ static char *version = #include #include #include +#include +#include +#include +#include +#include + #include #include #include #include #include -#include -#include -#include -#include -#include #include "cs89x0.h" static unsigned int net_debug = NET_DEBUG; diff --git a/drivers/net/macsonic.c b/drivers/net/macsonic.c index 72a8493afce1..937b5d086c93 100644 --- a/drivers/net/macsonic.c +++ b/drivers/net/macsonic.c @@ -26,7 +26,6 @@ */ #include -#include #include #include #include @@ -38,6 +37,12 @@ #include #include #include +#include +#include +#include +#include +#include + #include #include #include @@ -50,13 +55,6 @@ #include #include -#include - -#include -#include -#include -#include - #define SREGS_PAD(n) u16 n; #include "sonic.h" diff --git a/drivers/net/mvme147.c b/drivers/net/mvme147.c index 52bbc1d42069..699ed000cbe0 100644 --- a/drivers/net/mvme147.c +++ b/drivers/net/mvme147.c @@ -7,7 +7,6 @@ #include #include -#include #include #include #include @@ -16,20 +15,17 @@ #include #include #include -#include -#include -#include - /* Used for the temporal inet entries and routing */ #include #include - #include - #include #include #include +#include +#include +#include #include /* We have 16834 bytes of RAM for the init block and buffers. This places diff --git a/drivers/net/myri_sbus.c b/drivers/net/myri_sbus.c index 91789d82840a..88f3f6a63e1f 100644 --- a/drivers/net/myri_sbus.c +++ b/drivers/net/myri_sbus.c @@ -7,10 +7,9 @@ static char version[] = "myri_sbus.c:v1.9 12/Sep/99 David S. Miller (davem@redhat.com)\n"; #include - #include +#include #include -#include #include #include #include @@ -20,14 +19,20 @@ static char version[] = #include #include #include +#include +#include +#include + +#include +#include +#include +#include #include #include #include #include -#include #include - #include #include #include @@ -35,20 +40,9 @@ static char version[] = #include #include #include - -#include -#include -#include - -#include -#include -#include -#include - #include #include "myri_sbus.h" - #include "myri_code.h" /* #define DEBUG_DETECT */ diff --git a/drivers/net/ne.c b/drivers/net/ne.c index d996574d6691..9f38a51949e5 100644 --- a/drivers/net/ne.c +++ b/drivers/net/ne.c @@ -42,16 +42,17 @@ static const char version2[] = #include #include -#include #include #include #include +#include #include +#include +#include + #include #include -#include -#include #include "8390.h" /* Some defines that people can play with if so inclined. */ diff --git a/drivers/net/ne2.c b/drivers/net/ne2.c index 76a202705408..15f5739b1e56 100644 --- a/drivers/net/ne2.c +++ b/drivers/net/ne2.c @@ -61,9 +61,7 @@ static const char *version = "ne2.c:v0.91 Nov 16 1998 Wim Dumon #include - #include -#include #include #include #include @@ -71,20 +69,19 @@ static const char *version = "ne2.c:v0.91 Nov 16 1998 Wim Dumon #include #include -#include -#include -#include -#include #include #include #include - #include #include #include -#include "8390.h" +#include +#include +#include +#include +#include "8390.h" /* Some defines that people can play with if so inclined. */ diff --git a/drivers/net/ne2k-pci.c b/drivers/net/ne2k-pci.c index 28e23e9b1617..cd3ae0c11daa 100644 --- a/drivers/net/ne2k-pci.c +++ b/drivers/net/ne2k-pci.c @@ -46,19 +46,19 @@ static int options[MAX_UNITS]; #include #include -#include #include #include #include +#include #include +#include +#include #include #include #include #include -#include -#include #include "8390.h" /* These identify the driver base version and may not be removed. */ diff --git a/drivers/net/ne3210.c b/drivers/net/ne3210.c index 818527d9b3e7..16fc263dbc02 100644 --- a/drivers/net/ne3210.c +++ b/drivers/net/ne3210.c @@ -30,17 +30,17 @@ static const char *version = #include #include -#include #include #include #include #include +#include +#include +#include #include #include -#include -#include #include "8390.h" int ne3210_probe(struct net_device *dev); diff --git a/drivers/net/net_init.c b/drivers/net/net_init.c index ae7f4d415fc3..f864774428e6 100644 --- a/drivers/net/net_init.c +++ b/drivers/net/net_init.c @@ -36,7 +36,6 @@ #include #include #include -#include #include #include #include diff --git a/drivers/net/ni65.c b/drivers/net/ni65.c index 89567b878bbe..14ef0d24678a 100644 --- a/drivers/net/ni65.c +++ b/drivers/net/ni65.c @@ -62,7 +62,6 @@ */ #include -#include #include #include #include @@ -70,17 +69,16 @@ #include #include #include -#include -#include -#include - #include #include #include - #include #include +#include +#include +#include + #include "ni65.h" /* diff --git a/drivers/net/pcmcia/3c574_cs.c b/drivers/net/pcmcia/3c574_cs.c index e206fe318bd3..314231098d28 100644 --- a/drivers/net/pcmcia/3c574_cs.c +++ b/drivers/net/pcmcia/3c574_cs.c @@ -70,24 +70,18 @@ earlier 3Com products. #include #include #include -#include #include #include #include #include #include #include -#include -#include -#include - #include #include #include #include #include #include -#include #include #include @@ -98,6 +92,11 @@ earlier 3Com products. #include #include +#include +#include +#include +#include + /*====================================================================*/ /* Module parameters */ diff --git a/drivers/net/pcmcia/3c589_cs.c b/drivers/net/pcmcia/3c589_cs.c index dc1884f6fafd..c95b6e6a599c 100644 --- a/drivers/net/pcmcia/3c589_cs.c +++ b/drivers/net/pcmcia/3c589_cs.c @@ -25,7 +25,6 @@ #include #include #include -#include #include #include #include @@ -34,12 +33,6 @@ #include #include #include - -#include -#include -#include -#include - #include #include #include @@ -54,6 +47,11 @@ #include #include +#include +#include +#include +#include + /* To minimize the size of the driver source I only define operating constants if they are used several times. You'll need the manual if you want to understand driver details. */ diff --git a/drivers/net/pcmcia/aironet4500_cs.c b/drivers/net/pcmcia/aironet4500_cs.c index b73062178a1a..3ab22e11441c 100644 --- a/drivers/net/pcmcia/aironet4500_cs.c +++ b/drivers/net/pcmcia/aironet4500_cs.c @@ -20,7 +20,6 @@ DRV_NAME ".c v" DRV_VERSION " 1/1/99 Elmer Joandi, elmer@ylenurme.ee.\n"; #include #include #include -#include #include #include #include @@ -28,19 +27,12 @@ DRV_NAME ".c v" DRV_VERSION " 1/1/99 Elmer Joandi, elmer@ylenurme.ee.\n"; #include #include #include - -#include -#include -#include -#include - #include #include #include #include #include - #include #include #include @@ -54,8 +46,12 @@ DRV_NAME ".c v" DRV_VERSION " 1/1/99 Elmer Joandi, elmer@ylenurme.ee.\n"; #endif #include -#include "../aironet4500.h" +#include +#include +#include +#include +#include "../aironet4500.h" static u_int irq_mask = 0x5eF8; static int awc_ports[] = {0x140,0x100,0xc0, 0x80 }; diff --git a/drivers/net/pcmcia/axnet_cs.c b/drivers/net/pcmcia/axnet_cs.c index 4917fa4e496c..d739f9710809 100644 --- a/drivers/net/pcmcia/axnet_cs.c +++ b/drivers/net/pcmcia/axnet_cs.c @@ -27,7 +27,6 @@ #include #include #include -#include #include #include #include @@ -35,11 +34,6 @@ #include #include #include -#include -#include -#include -#include - #include #include "../8390.h" @@ -51,6 +45,11 @@ #include #include +#include +#include +#include +#include + #define AXNET_CMD 0x00 #define AXNET_DATAPORT 0x10 /* NatSemi-defined port window offset. */ #define AXNET_RESET 0x1f /* Issue a read to reset, a write to clear. */ diff --git a/drivers/net/pcmcia/com20020_cs.c b/drivers/net/pcmcia/com20020_cs.c index 4b475537d308..d06ed1ecd9e8 100644 --- a/drivers/net/pcmcia/com20020_cs.c +++ b/drivers/net/pcmcia/com20020_cs.c @@ -33,16 +33,12 @@ */ #include #include -#include #include #include #include #include #include #include -#include -#include - #include #include #include @@ -53,6 +49,9 @@ #include #include +#include +#include + #define VERSION "arcnet: COM20020 PCMCIA support loaded.\n" #ifdef PCMCIA_DEBUG diff --git a/drivers/net/pcmcia/fmvj18x_cs.c b/drivers/net/pcmcia/fmvj18x_cs.c index ac225e9d7501..1220d1a1d4d8 100644 --- a/drivers/net/pcmcia/fmvj18x_cs.c +++ b/drivers/net/pcmcia/fmvj18x_cs.c @@ -34,7 +34,6 @@ #include #include #include -#include #include #include #include @@ -43,11 +42,6 @@ #include #include #include - -#include -#include -#include - #include #include #include @@ -62,6 +56,10 @@ #include #include +#include +#include +#include + /*====================================================================*/ /* Module parameters */ diff --git a/drivers/net/pcmcia/ibmtr_cs.c b/drivers/net/pcmcia/ibmtr_cs.c index c81fb4a25771..a1e4be48ac1e 100644 --- a/drivers/net/pcmcia/ibmtr_cs.c +++ b/drivers/net/pcmcia/ibmtr_cs.c @@ -47,17 +47,12 @@ #include #include -#include #include #include #include #include #include #include -#include -#include -#include - #include #include #include @@ -68,6 +63,10 @@ #include #include +#include +#include +#include + #define PCMCIA #include "../tokenring/ibmtr.c" diff --git a/drivers/net/pcmcia/nmclan_cs.c b/drivers/net/pcmcia/nmclan_cs.c index e7ca87a01f17..0f0ad551e4f4 100644 --- a/drivers/net/pcmcia/nmclan_cs.c +++ b/drivers/net/pcmcia/nmclan_cs.c @@ -126,7 +126,6 @@ Include Files #include #include #include -#include #include #include #include @@ -135,12 +134,6 @@ Include Files #include #include #include - -#include -#include -#include -#include - #include #include #include @@ -154,6 +147,11 @@ Include Files #include #include +#include +#include +#include +#include + /* ---------------------------------------------------------------------------- Defines ---------------------------------------------------------------------------- */ diff --git a/drivers/net/pcmcia/pcnet_cs.c b/drivers/net/pcmcia/pcnet_cs.c index 9d8b70fe7da2..c01aa0baab96 100644 --- a/drivers/net/pcmcia/pcnet_cs.c +++ b/drivers/net/pcmcia/pcnet_cs.c @@ -31,18 +31,12 @@ #include #include #include -#include #include #include #include #include #include #include -#include -#include -#include -#include - #include #include <../drivers/net/8390.h> @@ -54,6 +48,11 @@ #include #include +#include +#include +#include +#include + #define PCNET_CMD 0x00 #define PCNET_DATAPORT 0x10 /* NatSemi-defined port window offset. */ #define PCNET_RESET 0x1f /* Issue a read to reset, a write to clear. */ diff --git a/drivers/net/pcmcia/ray_cs.c b/drivers/net/pcmcia/ray_cs.c index 169d302cd342..917f7ceff925 100644 --- a/drivers/net/pcmcia/ray_cs.c +++ b/drivers/net/pcmcia/ray_cs.c @@ -31,25 +31,18 @@ #include #include #include -#include #include #include #include #include #include #include - -#include -#include -#include - #include #include #include #include #include #include -#include #include #include @@ -62,6 +55,11 @@ #ifdef CONFIG_NET_PCMCIA_RADIO #include +#include +#include +#include +#include + /* Warning : these stuff will slow down the driver... */ #define WIRELESS_SPY /* Enable spying addresses */ /* Definitions we need for spy */ diff --git a/drivers/net/pcmcia/smc91c92_cs.c b/drivers/net/pcmcia/smc91c92_cs.c index 7ca5f454c34c..b9a8c3edaa56 100644 --- a/drivers/net/pcmcia/smc91c92_cs.c +++ b/drivers/net/pcmcia/smc91c92_cs.c @@ -28,17 +28,12 @@ #include #include #include -#include #include #include #include #include #include #include -#include -#include -#include - #include #include #include @@ -55,6 +50,10 @@ #include #include +#include +#include +#include + /* Ositech Seven of Diamonds firmware */ #include "ositech.h" diff --git a/drivers/net/pcmcia/xirc2ps_cs.c b/drivers/net/pcmcia/xirc2ps_cs.c index a5e21cec5c21..8c43908f526f 100644 --- a/drivers/net/pcmcia/xirc2ps_cs.c +++ b/drivers/net/pcmcia/xirc2ps_cs.c @@ -66,7 +66,6 @@ #include #include #include -#include #include #include #include @@ -75,11 +74,6 @@ #include #include #include -#include -#include -#include -#include - #include #include #include @@ -93,6 +87,11 @@ #include #include +#include +#include +#include +#include + #ifndef MANFID_COMPAQ #define MANFID_COMPAQ 0x0138 #define MANFID_COMPAQ2 0x0183 /* is this correct? */ diff --git a/drivers/net/pcnet32.c b/drivers/net/pcnet32.c index 1598c34f0127..0b38b85084b7 100644 --- a/drivers/net/pcnet32.c +++ b/drivers/net/pcnet32.c @@ -30,9 +30,7 @@ static const char *version = DRV_NAME ".c:v" DRV_VERSION " " DRV_RELDATE " tsbogend@alpha.franken.de\n"; #include - #include -#include #include #include #include @@ -44,16 +42,16 @@ DRV_NAME ".c:v" DRV_VERSION " " DRV_RELDATE " tsbogend@alpha.franken.de\n"; #include #include #include -#include -#include -#include -#include - #include #include #include #include +#include +#include +#include +#include + /* * PCI device identifiers for "new style" Linux PCI Device Drivers */ diff --git a/drivers/net/plip.c b/drivers/net/plip.c index d82e8bcddb52..3551dc49874f 100644 --- a/drivers/net/plip.c +++ b/drivers/net/plip.c @@ -90,36 +90,34 @@ static const char version[] = "NET3 PLIP version 2.4-parport gniibe@mri.co.jp\n" #include #include -#include #include #include #include #include #include -#include #include #include #include #include #include - #include #include #include #include #include -#include - #include #include #include +#include + +#include + +#include #include #include #include #include -#include - /* Maximum number of devices to support. */ #define PLIP_MAX 8 diff --git a/drivers/net/pppoe.c b/drivers/net/pppoe.c index 8ce8b92ed5e6..266212207d2f 100644 --- a/drivers/net/pppoe.c +++ b/drivers/net/pppoe.c @@ -52,14 +52,9 @@ #include #include - -#include - #include -#include #include #include - #include #include #include @@ -68,7 +63,6 @@ #include #include #include -#include #include #include #include @@ -78,7 +72,9 @@ #include #include +#include +#include static int __attribute__((unused)) pppoe_debug = 7; #define PPPOE_HASH_BITS 4 diff --git a/drivers/net/pppox.c b/drivers/net/pppox.c index 71647eb18d91..984630a636b5 100644 --- a/drivers/net/pppox.c +++ b/drivers/net/pppox.c @@ -21,23 +21,21 @@ #include #include - -#include - #include -#include #include #include - #include #include #include #include -#include #include #include #include +#include + +#include + static struct pppox_proto *proto[PX_MAX_PROTO+1]; int register_pppox_proto(int proto_num, struct pppox_proto *pp) diff --git a/drivers/net/rcpci45.c b/drivers/net/rcpci45.c index 7621f48f3446..0d3aaf8df2f5 100644 --- a/drivers/net/rcpci45.c +++ b/drivers/net/rcpci45.c @@ -48,7 +48,6 @@ #include #include -#include #include #include #include @@ -58,6 +57,7 @@ #include #include #include + #include /* For NR_IRQS only. */ #include #include diff --git a/drivers/net/sb1000.c b/drivers/net/sb1000.c index 22f29be9d695..ffdb6dbd1bed 100644 --- a/drivers/net/sb1000.c +++ b/drivers/net/sb1000.c @@ -35,13 +35,12 @@ static char version[] = "sb1000.c:v1.1.2 6/01/98 (fventuri@mediaone.net)\n"; #include - #include #include -#include #include #include #include +#include /* for SIOGCM/SIOSCM stuff */ #include #include #include @@ -49,17 +48,13 @@ static char version[] = "sb1000.c:v1.1.2 6/01/98 (fventuri@mediaone.net)\n"; #include #include #include /* for udelay() */ -#include +#include +#include #include #include +#include #include -#include -#include - -/* for SIOGCM/SIOSCM stuff */ - -#include #ifdef SB1000_DEBUG int sb1000_debug = SB1000_DEBUG; diff --git a/drivers/net/seeq8005.c b/drivers/net/seeq8005.c index 7c3296d7a296..12dada696b04 100644 --- a/drivers/net/seeq8005.c +++ b/drivers/net/seeq8005.c @@ -32,7 +32,6 @@ static const char version[] = #include #include -#include #include #include #include @@ -42,15 +41,16 @@ static const char version[] = #include #include #include +#include +#include +#include +#include + #include #include #include #include -#include -#include -#include -#include #include "seeq8005.h" /* First, a few definitions that the brave might change. */ diff --git a/drivers/net/sgiseeq.c b/drivers/net/sgiseeq.c index 03c2501e6c75..df9fb581bd77 100644 --- a/drivers/net/sgiseeq.c +++ b/drivers/net/sgiseeq.c @@ -5,30 +5,26 @@ */ #include #include -#include #include #include #include #include +#include #include +#include #include #include +#include +#include +#include +#include +#include #include #include #include #include #include -#include -#include - -#include -#include - -#include -#include -#include - #include #include #include diff --git a/drivers/net/shaper.c b/drivers/net/shaper.c index 064a62e51839..8ed18587633f 100644 --- a/drivers/net/shaper.c +++ b/drivers/net/shaper.c @@ -72,7 +72,6 @@ #include #include #include -#include #include #include #include @@ -83,9 +82,10 @@ #include #include #include +#include + #include #include -#include struct shaper_cb { __u32 shapelatency; /* Latency on frame */ diff --git a/drivers/net/sis900.c b/drivers/net/sis900.c index 5dd071b52bcf..31f892514b48 100644 --- a/drivers/net/sis900.c +++ b/drivers/net/sis900.c @@ -49,7 +49,6 @@ #include #include #include -#include #include #include #include diff --git a/drivers/net/sk_g16.c b/drivers/net/sk_g16.c index 80e26edbd4a5..bed40d85020e 100644 --- a/drivers/net/sk_g16.c +++ b/drivers/net/sk_g16.c @@ -60,24 +60,23 @@ static const char rcsid[] = "$Id: sk_g16.c,v 1.1 1994/06/30 16:25:15 root Exp $" #include #include -#include #include #include #include #include #include #include -#include -#include -#include #include #include #include - #include #include #include +#include +#include +#include + #include "sk_g16.h" /* diff --git a/drivers/net/sk_mca.c b/drivers/net/sk_mca.c index 5886a04d6c3e..ecb1efa2daad 100644 --- a/drivers/net/sk_mca.c +++ b/drivers/net/sk_mca.c @@ -82,7 +82,6 @@ History: *************************************************************************/ #include -#include #include #include #include @@ -92,17 +91,16 @@ History: #include #include #include -#include -#include -#include - #include #include - #include #include #include +#include +#include +#include + #define _SK_MCA_DRIVER_ #include "sk_mca.h" diff --git a/drivers/net/skfp/skfddi.c b/drivers/net/skfp/skfddi.c index 6d403a2e21f4..52f9d11ceba6 100644 --- a/drivers/net/skfp/skfddi.c +++ b/drivers/net/skfp/skfddi.c @@ -77,9 +77,7 @@ static const char *boot_msg = /* Include files */ #include - #include -#include #include #include #include @@ -88,16 +86,16 @@ static const char *boot_msg = #include #include #include -#include -#include -#include -#include #include // isdigit - #include #include #include +#include +#include +#include +#include + #include "h/types.h" #undef ADDR // undo Linux definition #include "h/skfbi.h" diff --git a/drivers/net/slhc.c b/drivers/net/slhc.c index b1a855c3f5e9..8bbb4666246d 100644 --- a/drivers/net/slhc.c +++ b/drivers/net/slhc.c @@ -60,7 +60,6 @@ #ifdef CONFIG_INET /* Entire module is for IP only */ -#include #include #include #include diff --git a/drivers/net/smc-mca.c b/drivers/net/smc-mca.c index 7d947eaa4095..20608807e9b2 100644 --- a/drivers/net/smc-mca.c +++ b/drivers/net/smc-mca.c @@ -36,22 +36,20 @@ - Some minor bug fixes */ - +#include #include - #include -#include #include #include #include +#include +#include + #include #include -#include -#include #include "8390.h" #include "smc-mca.h" -#include int ultramca_probe(struct net_device *dev); diff --git a/drivers/net/smc-ultra.c b/drivers/net/smc-ultra.c index bd990e3aed0f..b5b4f776c5fc 100644 --- a/drivers/net/smc-ultra.c +++ b/drivers/net/smc-ultra.c @@ -59,18 +59,17 @@ static const char version[] = #include #include - #include -#include #include #include #include #include +#include +#include + #include #include -#include -#include #include "8390.h" /* A zero-terminated list of I/O addresses to be probed. */ diff --git a/drivers/net/smc-ultra32.c b/drivers/net/smc-ultra32.c index 664990c899ae..5781d29f2793 100644 --- a/drivers/net/smc-ultra32.c +++ b/drivers/net/smc-ultra32.c @@ -48,16 +48,16 @@ static const char *version = "smc-ultra32.c: 06/97 v1.00\n"; #include #include -#include #include #include #include +#include +#include +#include #include #include -#include -#include #include "8390.h" int ultra32_probe(struct net_device *dev); diff --git a/drivers/net/smc9194.c b/drivers/net/smc9194.c index 959a34b51afa..6d0b5adbab33 100644 --- a/drivers/net/smc9194.c +++ b/drivers/net/smc9194.c @@ -60,7 +60,6 @@ static const char version[] = #include #include #include -#include #include #include #include @@ -70,15 +69,16 @@ static const char version[] = #include #include #include -#include -#include #include - #include #include #include +#include +#include + #include "smc9194.h" + /*------------------------------------------------------------------------ . . Configuration options, for the experienced user to change. diff --git a/drivers/net/stnic.c b/drivers/net/stnic.c index f505bc26fd2c..08d02f8ed121 100644 --- a/drivers/net/stnic.c +++ b/drivers/net/stnic.c @@ -9,15 +9,15 @@ #include #include - #include -#include #include +#include #include #include #include #include #include + #include #include #include diff --git a/drivers/net/sun3lance.c b/drivers/net/sun3lance.c index 9a9814b6da3f..ed2070e280f0 100644 --- a/drivers/net/sun3lance.c +++ b/drivers/net/sun3lance.c @@ -24,10 +24,8 @@ static char *version = "sun3lance.c: v1.2 1/12/2001 Sam Creasey (sammy@sammy.net)\n"; #include - #include #include -#include #include #include #include @@ -35,10 +33,12 @@ static char *version = "sun3lance.c: v1.2 1/12/2001 Sam Creasey (sammy@sammy.ne #include #include #include +#include +#include +#include #include #include - #include #include #include @@ -53,10 +53,6 @@ static char *version = "sun3lance.c: v1.2 1/12/2001 Sam Creasey (sammy@sammy.ne #include #endif -#include -#include -#include - /* sun3/60 addr/irq for the lance chip. If your sun is different, change this. */ #define LANCE_OBIO 0x120000 diff --git a/drivers/net/sunbmac.c b/drivers/net/sunbmac.c index e5d931545acd..6f037c40bc7d 100644 --- a/drivers/net/sunbmac.c +++ b/drivers/net/sunbmac.c @@ -7,7 +7,6 @@ #include #include -#include #include #include #include @@ -18,23 +17,22 @@ #include #include #include -#include -#include -#include -#include #include -#include +#include +#include +#include +#include +#include +#include +#include #include -#include +#include #include #include -#include #include - -#include -#include -#include +#include +#include #include "sunbmac.h" diff --git a/drivers/net/sungem.c b/drivers/net/sungem.c index 81abde13491a..5154b05e576b 100644 --- a/drivers/net/sungem.c +++ b/drivers/net/sungem.c @@ -17,11 +17,8 @@ */ #include - #include - #include -#include #include #include #include diff --git a/drivers/net/sunhme.c b/drivers/net/sunhme.c index 0088368dcb34..6e3243cf7153 100644 --- a/drivers/net/sunhme.c +++ b/drivers/net/sunhme.c @@ -17,10 +17,8 @@ static char version[] = "sunhme.c:v2.01 26/Mar/2002 David S. Miller (davem@redhat.com)\n"; #include - #include #include -#include #include #include #include @@ -34,11 +32,15 @@ static char version[] = #include #include #include +#include +#include +#include +#include + #include #include #include #include -#include #include #ifdef __sparc__ @@ -56,10 +58,6 @@ static char version[] = #include #include -#include -#include -#include - #ifdef CONFIG_PCI #include #ifdef __sparc__ diff --git a/drivers/net/sunlance.c b/drivers/net/sunlance.c index 0f9b4442acd0..91d4895a3f5f 100644 --- a/drivers/net/sunlance.c +++ b/drivers/net/sunlance.c @@ -76,9 +76,7 @@ static char lancestr[] = "LANCE"; #include #include - #include -#include #include #include #include @@ -89,18 +87,19 @@ static char lancestr[] = "LANCE"; #include #include #include +#include +#include /* Used for the temporal inet entries and routing */ +#include +#include +#include +#include + #include #include #include #include #include -#include #include /* Used by the checksum routines */ - -/* Used for the temporal inet entries and routing */ -#include -#include - #include #include #include @@ -108,10 +107,6 @@ static char lancestr[] = "LANCE"; #include /* For tpe-link-test? setting */ #include -#include -#include -#include - /* Define: 2^4 Tx buffers and 2^4 Rx buffers */ #ifndef LANCE_LOG_TX_BUFFERS #define LANCE_LOG_TX_BUFFERS 4 diff --git a/drivers/net/sunqe.c b/drivers/net/sunqe.c index 80032ace5055..1e21cbc006a3 100644 --- a/drivers/net/sunqe.c +++ b/drivers/net/sunqe.c @@ -11,10 +11,9 @@ static char version[] = "sunqe.c:v2.9 9/11/99 David S. Miller (davem@redhat.com)\n"; #include - #include -#include #include +#include #include #include #include @@ -24,14 +23,15 @@ static char version[] = #include #include #include +#include +#include +#include #include #include #include #include -#include #include - #include #include #include @@ -40,10 +40,6 @@ static char version[] = #include #include -#include -#include -#include - #include "sunqe.h" static struct sunqec *root_qec_dev; diff --git a/drivers/net/tc35815.c b/drivers/net/tc35815.c index 51df39b44161..d392b9497fe4 100644 --- a/drivers/net/tc35815.c +++ b/drivers/net/tc35815.c @@ -32,9 +32,7 @@ static const char *version = "tc35815.c:v0.00 26/07/2000 by Toshiba Corporation\n"; #include - #include -#include #include #include #include @@ -42,21 +40,20 @@ static const char *version = #include #include #include -#include -#include -#include -#include #include #include - #include #include #include #include #include #include -#include +#include +#include +#include +#include +#include /* * The name of the card. Is used for messages and in the requests for diff --git a/drivers/net/tokenring/3c359.c b/drivers/net/tokenring/3c359.c index 6eb24a02c416..fbfcb73738bb 100644 --- a/drivers/net/tokenring/3c359.c +++ b/drivers/net/tokenring/3c359.c @@ -44,9 +44,7 @@ #include #include - #include -#include #include #include #include @@ -63,6 +61,7 @@ #include #include #include + #include #include diff --git a/drivers/net/tokenring/abyss.c b/drivers/net/tokenring/abyss.c index d9d89306309f..0bda7e8225b9 100644 --- a/drivers/net/tokenring/abyss.c +++ b/drivers/net/tokenring/abyss.c @@ -27,17 +27,16 @@ #include #include -#include #include #include #include +#include +#include #include #include #include -#include -#include #include "tms380tr.h" #include "abyss.h" /* Madge-specific constants */ diff --git a/drivers/net/tokenring/ibmtr.c b/drivers/net/tokenring/ibmtr.c index b4dc5e7bd804..74906d093d3f 100644 --- a/drivers/net/tokenring/ibmtr.c +++ b/drivers/net/tokenring/ibmtr.c @@ -125,11 +125,11 @@ in the event that chatty debug messages are desired - jjs 12/30/98 */ /* some 95 OS send many non UI frame; this allow removing the warning */ #define TR_FILTERNONUI 1 -#include #include #include #include #include + #include #include diff --git a/drivers/net/tokenring/lanstreamer.c b/drivers/net/tokenring/lanstreamer.c index a4a819c1854d..881adfbbd163 100644 --- a/drivers/net/tokenring/lanstreamer.c +++ b/drivers/net/tokenring/lanstreamer.c @@ -100,9 +100,7 @@ #include #include - #include -#include #include #include #include @@ -120,6 +118,7 @@ #include #include #include + #include #include diff --git a/drivers/net/tokenring/madgemc.c b/drivers/net/tokenring/madgemc.c index 60c32006480f..453aaa0f5002 100644 --- a/drivers/net/tokenring/madgemc.c +++ b/drivers/net/tokenring/madgemc.c @@ -22,17 +22,16 @@ static const char version[] = "madgemc.c: v0.91 23/01/2000 by Adam Fritzler\n"; #include #include #include -#include #include #include #include +#include +#include #include #include #include -#include -#include #include "tms380tr.h" #include "madgemc.h" /* Madge-specific constants */ diff --git a/drivers/net/tokenring/olympic.c b/drivers/net/tokenring/olympic.c index 52f53eff9874..7b920a4f9237 100644 --- a/drivers/net/tokenring/olympic.c +++ b/drivers/net/tokenring/olympic.c @@ -82,9 +82,7 @@ #include #include - #include -#include #include #include #include @@ -101,6 +99,7 @@ #include #include #include + #include #include diff --git a/drivers/net/tokenring/smctr.c b/drivers/net/tokenring/smctr.c index 6eae368721a0..09ac95c77cdb 100644 --- a/drivers/net/tokenring/smctr.c +++ b/drivers/net/tokenring/smctr.c @@ -32,7 +32,6 @@ #include #include #include -#include #include #include #include @@ -42,22 +41,22 @@ #include #include #include -#include -#include -#include -#include -#include #include #include #include #include #include - #include #include #include #include +#include +#include +#include +#include +#include + #if BITS_PER_LONG == 64 #error FIXME: driver does not support 64-bit platforms #endif diff --git a/drivers/net/tokenring/tms380tr.c b/drivers/net/tokenring/tms380tr.c index 2d09f6ac7f22..762b009ca470 100644 --- a/drivers/net/tokenring/tms380tr.c +++ b/drivers/net/tokenring/tms380tr.c @@ -73,9 +73,7 @@ static const char version[] = "tms380tr.c: v1.08 14/01/2001 by Christoph Goos, A #include #include - #include -#include #include #include #include @@ -85,22 +83,22 @@ static const char version[] = "tms380tr.c: v1.08 14/01/2001 by Christoph Goos, A #include #include #include -#include -#include -#include -#include -#include -#include #include #include #include #include - #include #include #include #include +#include +#include +#include +#include +#include +#include + #include "tms380tr.h" /* Our Stuff */ #include "tms380tr_microcode.h" /* TI microcode for COMMprocessor */ diff --git a/drivers/net/tokenring/tmsisa.c b/drivers/net/tokenring/tmsisa.c index c0add8fb9ff9..3a8ab2d92330 100644 --- a/drivers/net/tokenring/tmsisa.c +++ b/drivers/net/tokenring/tmsisa.c @@ -23,10 +23,11 @@ static const char version[] = "tmsisa.c: v1.00 14/01/2001 by Jochen Friedrich\n" #include #include -#include #include #include #include +#include +#include #include #include @@ -34,8 +35,6 @@ static const char version[] = "tmsisa.c: v1.00 14/01/2001 by Jochen Friedrich\n" #include #include -#include -#include #include "tms380tr.h" #define TMS_ISA_IO_EXTENT 32 diff --git a/drivers/net/tokenring/tmspci.c b/drivers/net/tokenring/tmspci.c index 1123956f675a..6b26454f2fd3 100644 --- a/drivers/net/tokenring/tmspci.c +++ b/drivers/net/tokenring/tmspci.c @@ -28,17 +28,16 @@ #include #include -#include #include #include #include +#include +#include #include #include #include -#include -#include #include "tms380tr.h" static char version[] __initdata = diff --git a/drivers/net/tulip/de2104x.c b/drivers/net/tulip/de2104x.c index ab7a5cd545b7..49f93dd88ce6 100644 --- a/drivers/net/tulip/de2104x.c +++ b/drivers/net/tulip/de2104x.c @@ -41,9 +41,9 @@ #include #include #include -#include #include #include + #include #include #include diff --git a/drivers/net/tulip/de4x5.c b/drivers/net/tulip/de4x5.c index 30437813973c..d896b88cb1da 100644 --- a/drivers/net/tulip/de4x5.c +++ b/drivers/net/tulip/de4x5.c @@ -444,9 +444,7 @@ static const char *version = "de4x5.c:V0.546 2001/02/22 davies@maniac.ultranet.c #include #include - #include -#include #include #include #include @@ -459,6 +457,13 @@ static const char *version = "de4x5.c:V0.546 2001/02/22 davies@maniac.ultranet.c #include #include #include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -470,15 +475,6 @@ static const char *version = "de4x5.c:V0.546 2001/02/22 davies@maniac.ultranet.c #include #endif /* CONFIG_PPC */ -#include -#include -#include - -#include -#include -#include -#include - #include "de4x5.h" #define c_char const char diff --git a/drivers/net/tulip/dmfe.c b/drivers/net/tulip/dmfe.c index ca12d8c89130..df0c9b2953a1 100644 --- a/drivers/net/tulip/dmfe.c +++ b/drivers/net/tulip/dmfe.c @@ -65,9 +65,7 @@ #define DRV_RELDATE "2002-01-17" #include - #include -#include #include #include #include diff --git a/drivers/net/tulip/xircom_cb.c b/drivers/net/tulip/xircom_cb.c index 987efa2fbc86..2a261cabacbf 100644 --- a/drivers/net/tulip/xircom_cb.c +++ b/drivers/net/tulip/xircom_cb.c @@ -14,10 +14,8 @@ * $Id: xircom_cb.c,v 1.33 2001/03/19 14:02:07 arjanv Exp $ */ - #include #include -#include #include #include #include @@ -30,12 +28,11 @@ #include #include #include + #include #include #include - - #ifdef DEBUG #define enter(x) printk("Enter: %s, %s line %i\n",x,__FILE__,__LINE__) #define leave(x) printk("Leave: %s, %s line %i\n",x,__FILE__,__LINE__) diff --git a/drivers/net/tun.c b/drivers/net/tun.c index fde3582a4adf..9273e7867ca2 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c @@ -24,17 +24,14 @@ #include #include - #include #include #include -#include #include #include #include #include #include - #include #include #include diff --git a/drivers/net/wan/comx-hw-comx.c b/drivers/net/wan/comx-hw-comx.c index dedb2245d19c..06a8eda24741 100644 --- a/drivers/net/wan/comx-hw-comx.c +++ b/drivers/net/wan/comx-hw-comx.c @@ -49,12 +49,12 @@ #include #include #include -#include #include #include #include #include #include + #include #include diff --git a/drivers/net/wan/comx-hw-locomx.c b/drivers/net/wan/comx-hw-locomx.c index 76e41b5109ad..9fb2f7819c02 100644 --- a/drivers/net/wan/comx-hw-locomx.c +++ b/drivers/net/wan/comx-hw-locomx.c @@ -36,18 +36,19 @@ #define VERSION "0.14" +#include #include #include #include -#include #include #include +#include +#include + #include #include #include #include -#include -#include #include "comx.h" #include "z85230.h" diff --git a/drivers/net/wan/comx-hw-mixcom.c b/drivers/net/wan/comx-hw-mixcom.c index 59b392748338..349d1b35e3a0 100644 --- a/drivers/net/wan/comx-hw-mixcom.c +++ b/drivers/net/wan/comx-hw-mixcom.c @@ -39,19 +39,20 @@ #define VERSION "0.65" +#include #include #include #include -#include #include #include -#include -#include -#include #include #include #include +#include +#include +#include + #include "comx.h" #include "mixcom.h" #include "hscx.h" diff --git a/drivers/net/wan/comx-hw-munich.c b/drivers/net/wan/comx-hw-munich.c index 80fe7bd380a8..fc5d622ecbd1 100644 --- a/drivers/net/wan/comx-hw-munich.c +++ b/drivers/net/wan/comx-hw-munich.c @@ -32,16 +32,16 @@ #include #include #include -#include #include #include +#include +#include +#include + #include #include #include #include -#include -#include -#include #define COMX_NEW diff --git a/drivers/net/wan/comx-proto-fr.c b/drivers/net/wan/comx-proto-fr.c index 759e8d9a14cf..691233876c8a 100644 --- a/drivers/net/wan/comx-proto-fr.c +++ b/drivers/net/wan/comx-proto-fr.c @@ -46,6 +46,7 @@ #include #include #include + #include #include "comx.h" diff --git a/drivers/net/wan/cosa.c b/drivers/net/wan/cosa.c index 6d8b44702233..6b246ca0ab95 100644 --- a/drivers/net/wan/cosa.c +++ b/drivers/net/wan/cosa.c @@ -86,7 +86,6 @@ #include #include #include -#include #include #include #include diff --git a/drivers/net/wan/dlci.c b/drivers/net/wan/dlci.c index 22a478661029..8feb17b43d4f 100644 --- a/drivers/net/wan/dlci.c +++ b/drivers/net/wan/dlci.c @@ -30,9 +30,7 @@ #include /* for CONFIG_DLCI_COUNT */ #include - #include -#include #include #include #include @@ -42,14 +40,7 @@ #include #include #include -#include -#include -#include -#include -#include - #include - #include #include #include @@ -57,6 +48,12 @@ #include +#include +#include +#include +#include +#include + static const char devname[] = "dlci"; static const char version[] = "DLCI driver v0.35, 4 Jan 1997, mike.mclagan@linux.org"; diff --git a/drivers/net/wan/hdlc_cisco.c b/drivers/net/wan/hdlc_cisco.c index 98bb396878e3..4d837aea20b1 100644 --- a/drivers/net/wan/hdlc_cisco.c +++ b/drivers/net/wan/hdlc_cisco.c @@ -15,7 +15,6 @@ #include #include #include -#include #include #include #include diff --git a/drivers/net/wan/hdlc_fr.c b/drivers/net/wan/hdlc_fr.c index fc18a8a0c7a9..20a67ed26811 100644 --- a/drivers/net/wan/hdlc_fr.c +++ b/drivers/net/wan/hdlc_fr.c @@ -15,7 +15,6 @@ #include #include #include -#include #include #include #include diff --git a/drivers/net/wan/hdlc_generic.c b/drivers/net/wan/hdlc_generic.c index 8f00c3e7f714..09d2b24b109c 100644 --- a/drivers/net/wan/hdlc_generic.c +++ b/drivers/net/wan/hdlc_generic.c @@ -26,7 +26,6 @@ #include #include #include -#include #include #include #include diff --git a/drivers/net/wan/hdlc_ppp.c b/drivers/net/wan/hdlc_ppp.c index b8cd395f720d..2e9d40cf9e4d 100644 --- a/drivers/net/wan/hdlc_ppp.c +++ b/drivers/net/wan/hdlc_ppp.c @@ -15,7 +15,6 @@ #include #include #include -#include #include #include #include diff --git a/drivers/net/wan/hdlc_raw.c b/drivers/net/wan/hdlc_raw.c index d1267a9decc1..66d32beabb5a 100644 --- a/drivers/net/wan/hdlc_raw.c +++ b/drivers/net/wan/hdlc_raw.c @@ -15,7 +15,6 @@ #include #include #include -#include #include #include #include diff --git a/drivers/net/wan/hdlc_x25.c b/drivers/net/wan/hdlc_x25.c index 0817c3fa1dd5..ff70ac6f1f07 100644 --- a/drivers/net/wan/hdlc_x25.c +++ b/drivers/net/wan/hdlc_x25.c @@ -15,7 +15,6 @@ #include #include #include -#include #include #include #include diff --git a/drivers/net/wan/n2.c b/drivers/net/wan/n2.c index 9a1a786bd938..ccd5ae7bc62f 100644 --- a/drivers/net/wan/n2.c +++ b/drivers/net/wan/n2.c @@ -21,7 +21,6 @@ #include #include #include -#include #include #include #include diff --git a/drivers/net/wan/pc300_drv.c b/drivers/net/wan/pc300_drv.c index 7954f7e9c504..378478faac1e 100644 --- a/drivers/net/wan/pc300_drv.c +++ b/drivers/net/wan/pc300_drv.c @@ -219,7 +219,6 @@ static char rcsid[] = #include #include #include -#include #include #include #include @@ -229,10 +228,12 @@ static char rcsid[] = #include #include #include + +#include #include + #include #include -#include #include "pc300.h" diff --git a/drivers/net/wan/pc300_tty.c b/drivers/net/wan/pc300_tty.c index f4953a99652d..7d1d15227bf0 100644 --- a/drivers/net/wan/pc300_tty.c +++ b/drivers/net/wan/pc300_tty.c @@ -42,21 +42,20 @@ #include #include #include -#include #include #include #include #include #include -#include -#include #include - /* TTY includes */ #include #include #include +#include +#include + #include "pc300.h" /* defines and macros */ diff --git a/drivers/net/wan/sbni.c b/drivers/net/wan/sbni.c index 825c3a5a4411..5d8b29111988 100644 --- a/drivers/net/wan/sbni.c +++ b/drivers/net/wan/sbni.c @@ -37,9 +37,9 @@ * Known problem: this driver wasn't tested on multiprocessor machine. */ +#include #include #include -#include #include #include #include @@ -47,26 +47,22 @@ #include #include #include - -#include -#include -#include -#include -#include - - #include #include +#include #include #include #include #include -#include -#include -#include "sbni.h" +#include +#include +#include +#include +#include +#include "sbni.h" /* device private data */ diff --git a/drivers/net/wan/sdla.c b/drivers/net/wan/sdla.c index f170e52c30e9..97deb0a11d54 100644 --- a/drivers/net/wan/sdla.c +++ b/drivers/net/wan/sdla.c @@ -34,9 +34,7 @@ #include /* for CONFIG_DLCI_MAX */ #include - #include -#include #include #include #include @@ -48,6 +46,11 @@ #include #include #include +#include +#include +#include +#include +#include #include #include @@ -55,13 +58,6 @@ #include #include -#include -#include -#include -#include - -#include - static const char* version = "SDLA driver v0.30, 12 Sep 1996, mike.mclagan@linux.org"; static const char* devname = "sdla"; diff --git a/drivers/net/wan/syncppp.c b/drivers/net/wan/syncppp.c index 7d384c713988..4340d25288d2 100644 --- a/drivers/net/wan/syncppp.c +++ b/drivers/net/wan/syncppp.c @@ -41,7 +41,6 @@ #include #include #include -#include #include #include #include @@ -50,11 +49,13 @@ #include #include #include -#include -#include #include + #include +#include +#include + #define MAXALIVECNT 6 /* max. alive packets */ #define PPP_ALLSTATIONS 0xff /* All-Stations broadcast address */ diff --git a/drivers/net/wd.c b/drivers/net/wd.c index e2cfc069e67d..411a448d2f2f 100644 --- a/drivers/net/wd.c +++ b/drivers/net/wd.c @@ -29,18 +29,18 @@ static const char version[] = "wd.c:v1.10 9/23/94 Donald Becker (becker@cesdis.gsfc.nasa.gov)\n"; #include - #include -#include #include #include #include +#include #include +#include +#include + #include #include -#include -#include #include "8390.h" /* A zero-terminated list of I/O addresses to be probed. */ diff --git a/drivers/net/wireless/airo_cs.c b/drivers/net/wireless/airo_cs.c index 3ea681d21281..06dafe83d5fa 100644 --- a/drivers/net/wireless/airo_cs.c +++ b/drivers/net/wireless/airo_cs.c @@ -24,19 +24,14 @@ #ifdef __IN_PCMCIA_PACKAGE__ #include #endif - #include #include #include - -#include #include #include #include #include #include -#include -#include #include #include @@ -45,6 +40,9 @@ #include #include +#include +#include + /* All the PCMCIA modules use PCMCIA_DEBUG to control debugging. If you do not define PCMCIA_DEBUG at all, all the debug code will be diff --git a/drivers/net/wireless/airport.c b/drivers/net/wireless/airport.c index 62945d21fce3..68b2a7010b43 100644 --- a/drivers/net/wireless/airport.c +++ b/drivers/net/wireless/airport.c @@ -12,19 +12,14 @@ */ #include - #include #include #include -#include #include #include #include #include #include -#include -#include -#include #include #include #include @@ -33,10 +28,14 @@ #include #include +#include +#include +#include #include #include #include #include +#include #include "orinoco.h" diff --git a/drivers/net/wireless/netwave_cs.c b/drivers/net/wireless/netwave_cs.c index d6a1b0f06215..d382d2c559ec 100644 --- a/drivers/net/wireless/netwave_cs.c +++ b/drivers/net/wireless/netwave_cs.c @@ -41,7 +41,6 @@ #include #include #include -#include #include #include #include @@ -51,16 +50,10 @@ #include #include #include -#include -#include -#include -#include #include - #include #include #include - #ifdef CONFIG_NET_RADIO #include #if WIRELESS_EXT > 12 @@ -76,6 +69,11 @@ #include #include +#include +#include +#include +#include + #define NETWAVE_REGOFF 0x8000 /* The Netwave IO registers, offsets to iobase */ #define NETWAVE_REG_COR 0x0 diff --git a/drivers/net/wireless/orinoco.c b/drivers/net/wireless/orinoco.c index b6b85908e64c..3c69c80a682b 100644 --- a/drivers/net/wireless/orinoco.c +++ b/drivers/net/wireless/orinoco.c @@ -364,15 +364,11 @@ #include #include #include -#include #include #include #include #include #include -#include -#include -#include #include #include #include @@ -380,6 +376,10 @@ #include #include +#include +#include +#include + #include "hermes.h" #include "hermes_rid.h" #include "orinoco.h" diff --git a/drivers/net/wireless/orinoco_cs.c b/drivers/net/wireless/orinoco_cs.c index 2170d6043ad5..42b23938edaa 100644 --- a/drivers/net/wireless/orinoco_cs.c +++ b/drivers/net/wireless/orinoco_cs.c @@ -14,7 +14,6 @@ #ifdef __IN_PCMCIA_PACKAGE__ #include #endif /* __IN_PCMCIA_PACKAGE__ */ - #include #include #include @@ -24,9 +23,6 @@ #include #include #include -#include -#include -#include #include #include #include @@ -41,6 +37,10 @@ #include #include +#include +#include +#include + #include "orinoco.h" /********************************************************************/ diff --git a/drivers/net/wireless/orinoco_pci.c b/drivers/net/wireless/orinoco_pci.c index 3150fe9bd72e..8a652c2da048 100644 --- a/drivers/net/wireless/orinoco_pci.c +++ b/drivers/net/wireless/orinoco_pci.c @@ -84,7 +84,6 @@ */ #include - #include #include #include @@ -94,9 +93,6 @@ #include #include #include -#include -#include -#include #include #include #include @@ -107,6 +103,10 @@ #include #include +#include +#include +#include + #include "hermes.h" #include "orinoco.h" diff --git a/drivers/net/znet.c b/drivers/net/znet.c index aae65abe8c47..de6db6a95c55 100644 --- a/drivers/net/znet.c +++ b/drivers/net/znet.c @@ -88,23 +88,22 @@ #include #include #include -#include #include #include #include #include #include #include -#include -#include -#include -#include - #include #include #include #include +#include +#include +#include +#include + /* This include could be elsewhere, since it is not wireless specific */ #include "wireless/i82593.h" -- 2.39.5