aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2012-03-28 13:30:03 -0400
committerDavid Howells <dhowells@redhat.com>2012-03-28 13:30:03 -0400
commit9ffc93f203c18a70623f21950f1dd473c9ec48cd (patch)
tree1eb3536ae183b0bfbf7f5152a6fe4f430ae881c2 /drivers/net
parent96f951edb1f1bdbbc99b0cd458f9808bb83d58ae (diff)
Remove all #inclusions of asm/system.h
Remove all #inclusions of asm/system.h preparatory to splitting and killing it. Performed with the following command: perl -p -i -e 's!^#\s*include\s*<asm/system[.]h>.*\n!!' `grep -Irl '^#\s*include\s*<asm/system[.]h>' *` Signed-off-by: David Howells <dhowells@redhat.com>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/appletalk/cops.c1
-rw-r--r--drivers/net/appletalk/ltpc.c1
-rw-r--r--drivers/net/arcnet/com20020_cs.c1
-rw-r--r--drivers/net/bonding/bond_main.c1
-rw-r--r--drivers/net/can/slcan.c1
-rw-r--r--drivers/net/cris/eth_v10.c1
-rw-r--r--drivers/net/ethernet/3com/3c574_cs.c1
-rw-r--r--drivers/net/ethernet/3com/3c589_cs.c1
-rw-r--r--drivers/net/ethernet/8390/3c503.c1
-rw-r--r--drivers/net/ethernet/8390/ac3200.c1
-rw-r--r--drivers/net/ethernet/8390/apne.c1
-rw-r--r--drivers/net/ethernet/8390/ax88796.c1
-rw-r--r--drivers/net/ethernet/8390/axnet_cs.c1
-rw-r--r--drivers/net/ethernet/8390/e2100.c1
-rw-r--r--drivers/net/ethernet/8390/es3210.c1
-rw-r--r--drivers/net/ethernet/8390/etherh.c1
-rw-r--r--drivers/net/ethernet/8390/hp-plus.c1
-rw-r--r--drivers/net/ethernet/8390/hp.c1
-rw-r--r--drivers/net/ethernet/8390/lib8390.c1
-rw-r--r--drivers/net/ethernet/8390/lne390.c1
-rw-r--r--drivers/net/ethernet/8390/mac8390.c1
-rw-r--r--drivers/net/ethernet/8390/ne-h8300.c1
-rw-r--r--drivers/net/ethernet/8390/ne.c1
-rw-r--r--drivers/net/ethernet/8390/ne2.c1
-rw-r--r--drivers/net/ethernet/8390/ne2k-pci.c1
-rw-r--r--drivers/net/ethernet/8390/ne3210.c1
-rw-r--r--drivers/net/ethernet/8390/pcnet_cs.c1
-rw-r--r--drivers/net/ethernet/8390/smc-mca.c1
-rw-r--r--drivers/net/ethernet/8390/smc-ultra.c1
-rw-r--r--drivers/net/ethernet/8390/smc-ultra32.c1
-rw-r--r--drivers/net/ethernet/8390/stnic.c1
-rw-r--r--drivers/net/ethernet/8390/wd.c1
-rw-r--r--drivers/net/ethernet/8390/zorro8390.c1
-rw-r--r--drivers/net/ethernet/alteon/acenic.c1
-rw-r--r--drivers/net/ethernet/amd/7990.c1
-rw-r--r--drivers/net/ethernet/amd/am79c961a.c1
-rw-r--r--drivers/net/ethernet/amd/amd8111e.c1
-rw-r--r--drivers/net/ethernet/amd/declance.c1
-rw-r--r--drivers/net/ethernet/amd/hplance.c1
-rw-r--r--drivers/net/ethernet/amd/mvme147.c1
-rw-r--r--drivers/net/ethernet/amd/nmclan_cs.c1
-rw-r--r--drivers/net/ethernet/amd/sunlance.c1
-rw-r--r--drivers/net/ethernet/broadcom/tg3.c1
-rw-r--r--drivers/net/ethernet/cirrus/cs89x0.c1
-rw-r--r--drivers/net/ethernet/cirrus/mac89x0.c1
-rw-r--r--drivers/net/ethernet/dlink/de600.c1
-rw-r--r--drivers/net/ethernet/dlink/de620.c1
-rw-r--r--drivers/net/ethernet/fujitsu/at1700.c1
-rw-r--r--drivers/net/ethernet/fujitsu/eth16i.c1
-rw-r--r--drivers/net/ethernet/fujitsu/fmvj18x_cs.c1
-rw-r--r--drivers/net/ethernet/i825xx/3c507.c1
-rw-r--r--drivers/net/ethernet/i825xx/3c527.c1
-rw-r--r--drivers/net/ethernet/i825xx/eepro.c1
-rw-r--r--drivers/net/ethernet/i825xx/eexpress.c1
-rw-r--r--drivers/net/ethernet/i825xx/ether1.c1
-rw-r--r--drivers/net/ethernet/i825xx/znet.c1
-rw-r--r--drivers/net/ethernet/korina.c1
-rw-r--r--drivers/net/ethernet/marvell/mv643xx_eth.c1
-rw-r--r--drivers/net/ethernet/marvell/pxa168_eth.c1
-rw-r--r--drivers/net/ethernet/natsemi/jazzsonic.c1
-rw-r--r--drivers/net/ethernet/natsemi/macsonic.c1
-rw-r--r--drivers/net/ethernet/natsemi/ns83820.c1
-rw-r--r--drivers/net/ethernet/neterion/s2io.c1
-rw-r--r--drivers/net/ethernet/nvidia/forcedeth.c1
-rw-r--r--drivers/net/ethernet/realtek/atp.c1
-rw-r--r--drivers/net/ethernet/realtek/r8169.c1
-rw-r--r--drivers/net/ethernet/seeq/ether3.c1
-rw-r--r--drivers/net/ethernet/seeq/seeq8005.c1
-rw-r--r--drivers/net/ethernet/smsc/smc91c92_cs.c1
-rw-r--r--drivers/net/ethernet/sun/cassini.c1
-rw-r--r--drivers/net/ethernet/sun/sunbmac.c1
-rw-r--r--drivers/net/ethernet/sun/sungem.c1
-rw-r--r--drivers/net/ethernet/sun/sunhme.c1
-rw-r--r--drivers/net/ethernet/sun/sunqe.c1
-rw-r--r--drivers/net/ethernet/tundra/tsi108_eth.c1
-rw-r--r--drivers/net/ethernet/xircom/xirc2ps_cs.c1
-rw-r--r--drivers/net/hamradio/6pack.c1
-rw-r--r--drivers/net/hamradio/baycom_par.c1
-rw-r--r--drivers/net/hamradio/bpqether.c1
-rw-r--r--drivers/net/hamradio/mkiss.c1
-rw-r--r--drivers/net/hamradio/scc.c1
-rw-r--r--drivers/net/hamradio/yam.c1
-rw-r--r--drivers/net/hippi/rrunner.c1
-rw-r--r--drivers/net/irda/donauboe.c1
-rw-r--r--drivers/net/loopback.c1
-rw-r--r--drivers/net/plip/plip.c1
-rw-r--r--drivers/net/slip/slhc.c1
-rw-r--r--drivers/net/slip/slip.c1
-rw-r--r--drivers/net/tokenring/3c359.c1
-rw-r--r--drivers/net/tokenring/abyss.c1
-rw-r--r--drivers/net/tokenring/ibmtr_cs.c1
-rw-r--r--drivers/net/tokenring/lanstreamer.c1
-rw-r--r--drivers/net/tokenring/madgemc.c1
-rw-r--r--drivers/net/tokenring/olympic.c1
-rw-r--r--drivers/net/tokenring/proteon.c1
-rw-r--r--drivers/net/tokenring/skisa.c1
-rw-r--r--drivers/net/tokenring/smctr.c1
-rw-r--r--drivers/net/tokenring/tms380tr.c1
-rw-r--r--drivers/net/tokenring/tmspci.c1
-rw-r--r--drivers/net/tun.c1
-rw-r--r--drivers/net/wan/dlci.c1
-rw-r--r--drivers/net/wan/dscc4.c1
-rw-r--r--drivers/net/wan/hd64570.c1
-rw-r--r--drivers/net/wan/hd64572.c1
-rw-r--r--drivers/net/wan/lapbether.c1
-rw-r--r--drivers/net/wan/sdla.c1
-rw-r--r--drivers/net/wan/x25_asy.c1
-rw-r--r--drivers/net/wireless/airo.c1
-rw-r--r--drivers/net/wireless/airo_cs.c1
-rw-r--r--drivers/net/wireless/atmel.c1
-rw-r--r--drivers/net/wireless/atmel_cs.c1
-rw-r--r--drivers/net/wireless/prism54/islpci_mgt.c1
-rw-r--r--drivers/net/wireless/ray_cs.c1
-rw-r--r--drivers/net/wireless/wl3501_cs.c1
114 files changed, 0 insertions, 114 deletions
diff --git a/drivers/net/appletalk/cops.c b/drivers/net/appletalk/cops.c
index 9abd4eb86dc1..dd5e04813b76 100644
--- a/drivers/net/appletalk/cops.c
+++ b/drivers/net/appletalk/cops.c
@@ -70,7 +70,6 @@ static const char *version =
70#include <linux/bitops.h> 70#include <linux/bitops.h>
71#include <linux/jiffies.h> 71#include <linux/jiffies.h>
72 72
73#include <asm/system.h>
74#include <asm/io.h> 73#include <asm/io.h>
75#include <asm/dma.h> 74#include <asm/dma.h>
76 75
diff --git a/drivers/net/appletalk/ltpc.c b/drivers/net/appletalk/ltpc.c
index 6057b30417a2..0910dce3996d 100644
--- a/drivers/net/appletalk/ltpc.c
+++ b/drivers/net/appletalk/ltpc.c
@@ -229,7 +229,6 @@ static int dma;
229#include <linux/bitops.h> 229#include <linux/bitops.h>
230#include <linux/gfp.h> 230#include <linux/gfp.h>
231 231
232#include <asm/system.h>
233#include <asm/dma.h> 232#include <asm/dma.h>
234#include <asm/io.h> 233#include <asm/io.h>
235 234
diff --git a/drivers/net/arcnet/com20020_cs.c b/drivers/net/arcnet/com20020_cs.c
index 980e65c14936..5bed4c4e2508 100644
--- a/drivers/net/arcnet/com20020_cs.c
+++ b/drivers/net/arcnet/com20020_cs.c
@@ -47,7 +47,6 @@
47#include <pcmcia/ds.h> 47#include <pcmcia/ds.h>
48 48
49#include <asm/io.h> 49#include <asm/io.h>
50#include <asm/system.h>
51 50
52#define VERSION "arcnet: COM20020 PCMCIA support loaded.\n" 51#define VERSION "arcnet: COM20020 PCMCIA support loaded.\n"
53 52
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 0730203a19f2..d6e85864beea 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -54,7 +54,6 @@
54#include <linux/inet.h> 54#include <linux/inet.h>
55#include <linux/bitops.h> 55#include <linux/bitops.h>
56#include <linux/io.h> 56#include <linux/io.h>
57#include <asm/system.h>
58#include <asm/dma.h> 57#include <asm/dma.h>
59#include <linux/uaccess.h> 58#include <linux/uaccess.h>
60#include <linux/errno.h> 59#include <linux/errno.h>
diff --git a/drivers/net/can/slcan.c b/drivers/net/can/slcan.c
index 98a5a7d867f5..034c16b60e96 100644
--- a/drivers/net/can/slcan.c
+++ b/drivers/net/can/slcan.c
@@ -40,7 +40,6 @@
40#include <linux/module.h> 40#include <linux/module.h>
41#include <linux/moduleparam.h> 41#include <linux/moduleparam.h>
42 42
43#include <asm/system.h>
44#include <linux/uaccess.h> 43#include <linux/uaccess.h>
45#include <linux/bitops.h> 44#include <linux/bitops.h>
46#include <linux/string.h> 45#include <linux/string.h>
diff --git a/drivers/net/cris/eth_v10.c b/drivers/net/cris/eth_v10.c
index 7cb2785e209d..ec03b401620a 100644
--- a/drivers/net/cris/eth_v10.c
+++ b/drivers/net/cris/eth_v10.c
@@ -35,7 +35,6 @@
35#include <asm/io.h> /* CRIS_LED_* I/O functions */ 35#include <asm/io.h> /* CRIS_LED_* I/O functions */
36#include <asm/irq.h> 36#include <asm/irq.h>
37#include <asm/dma.h> 37#include <asm/dma.h>
38#include <asm/system.h>
39#include <asm/ethernet.h> 38#include <asm/ethernet.h>
40#include <asm/cache.h> 39#include <asm/cache.h>
41#include <arch/io_interface_mux.h> 40#include <arch/io_interface_mux.h>
diff --git a/drivers/net/ethernet/3com/3c574_cs.c b/drivers/net/ethernet/3com/3c574_cs.c
index e61b2f82ba3a..66df93638085 100644
--- a/drivers/net/ethernet/3com/3c574_cs.c
+++ b/drivers/net/ethernet/3com/3c574_cs.c
@@ -95,7 +95,6 @@ earlier 3Com products.
95 95
96#include <asm/uaccess.h> 96#include <asm/uaccess.h>
97#include <asm/io.h> 97#include <asm/io.h>
98#include <asm/system.h>
99 98
100/*====================================================================*/ 99/*====================================================================*/
101 100
diff --git a/drivers/net/ethernet/3com/3c589_cs.c b/drivers/net/ethernet/3com/3c589_cs.c
index b23253b9f742..a556c01e011b 100644
--- a/drivers/net/ethernet/3com/3c589_cs.c
+++ b/drivers/net/ethernet/3com/3c589_cs.c
@@ -50,7 +50,6 @@
50 50
51#include <asm/uaccess.h> 51#include <asm/uaccess.h>
52#include <asm/io.h> 52#include <asm/io.h>
53#include <asm/system.h>
54 53
55/* To minimize the size of the driver source I only define operating 54/* To minimize the size of the driver source I only define operating
56 constants if they are used several times. You'll need the manual 55 constants if they are used several times. You'll need the manual
diff --git a/drivers/net/ethernet/8390/3c503.c b/drivers/net/ethernet/8390/3c503.c
index fbab1367505f..49d76bd0dc86 100644
--- a/drivers/net/ethernet/8390/3c503.c
+++ b/drivers/net/ethernet/8390/3c503.c
@@ -54,7 +54,6 @@ static const char version[] =
54 54
55#include <asm/uaccess.h> 55#include <asm/uaccess.h>
56#include <asm/io.h> 56#include <asm/io.h>
57#include <asm/system.h>
58#include <asm/byteorder.h> 57#include <asm/byteorder.h>
59 58
60#include "8390.h" 59#include "8390.h"
diff --git a/drivers/net/ethernet/8390/ac3200.c b/drivers/net/ethernet/8390/ac3200.c
index 5337dd0a59b0..ccf07942ff6e 100644
--- a/drivers/net/ethernet/8390/ac3200.c
+++ b/drivers/net/ethernet/8390/ac3200.c
@@ -34,7 +34,6 @@ static const char version[] =
34#include <linux/init.h> 34#include <linux/init.h>
35#include <linux/interrupt.h> 35#include <linux/interrupt.h>
36 36
37#include <asm/system.h>
38#include <asm/io.h> 37#include <asm/io.h>
39#include <asm/irq.h> 38#include <asm/irq.h>
40 39
diff --git a/drivers/net/ethernet/8390/apne.c b/drivers/net/ethernet/8390/apne.c
index 3ad5d2f9a49c..923959275a82 100644
--- a/drivers/net/ethernet/8390/apne.c
+++ b/drivers/net/ethernet/8390/apne.c
@@ -39,7 +39,6 @@
39#include <linux/interrupt.h> 39#include <linux/interrupt.h>
40#include <linux/jiffies.h> 40#include <linux/jiffies.h>
41 41
42#include <asm/system.h>
43#include <asm/io.h> 42#include <asm/io.h>
44#include <asm/setup.h> 43#include <asm/setup.h>
45#include <asm/amigaints.h> 44#include <asm/amigaints.h>
diff --git a/drivers/net/ethernet/8390/ax88796.c b/drivers/net/ethernet/8390/ax88796.c
index c30adcc9828a..11476ca95e93 100644
--- a/drivers/net/ethernet/8390/ax88796.c
+++ b/drivers/net/ethernet/8390/ax88796.c
@@ -31,7 +31,6 @@
31 31
32#include <net/ax88796.h> 32#include <net/ax88796.h>
33 33
34#include <asm/system.h>
35 34
36/* Rename the lib8390.c functions to show that they are in this driver */ 35/* Rename the lib8390.c functions to show that they are in this driver */
37#define __ei_open ax_ei_open 36#define __ei_open ax_ei_open
diff --git a/drivers/net/ethernet/8390/axnet_cs.c b/drivers/net/ethernet/8390/axnet_cs.c
index c5bd8eb7a9f5..e1b3941bd149 100644
--- a/drivers/net/ethernet/8390/axnet_cs.c
+++ b/drivers/net/ethernet/8390/axnet_cs.c
@@ -46,7 +46,6 @@
46#include <pcmcia/cisreg.h> 46#include <pcmcia/cisreg.h>
47 47
48#include <asm/io.h> 48#include <asm/io.h>
49#include <asm/system.h>
50#include <asm/byteorder.h> 49#include <asm/byteorder.h>
51#include <asm/uaccess.h> 50#include <asm/uaccess.h>
52 51
diff --git a/drivers/net/ethernet/8390/e2100.c b/drivers/net/ethernet/8390/e2100.c
index d16dc53c1813..ed55ce85ebbf 100644
--- a/drivers/net/ethernet/8390/e2100.c
+++ b/drivers/net/ethernet/8390/e2100.c
@@ -48,7 +48,6 @@ static const char version[] =
48#include <linux/delay.h> 48#include <linux/delay.h>
49 49
50#include <asm/io.h> 50#include <asm/io.h>
51#include <asm/system.h>
52 51
53#include "8390.h" 52#include "8390.h"
54 53
diff --git a/drivers/net/ethernet/8390/es3210.c b/drivers/net/ethernet/8390/es3210.c
index 6428f9e7a554..ba1b5c95531f 100644
--- a/drivers/net/ethernet/8390/es3210.c
+++ b/drivers/net/ethernet/8390/es3210.c
@@ -59,7 +59,6 @@ static const char version[] =
59#include <linux/etherdevice.h> 59#include <linux/etherdevice.h>
60 60
61#include <asm/io.h> 61#include <asm/io.h>
62#include <asm/system.h>
63 62
64#include "8390.h" 63#include "8390.h"
65 64
diff --git a/drivers/net/ethernet/8390/etherh.c b/drivers/net/ethernet/8390/etherh.c
index a45b0d8a9f12..dbefd5658c14 100644
--- a/drivers/net/ethernet/8390/etherh.c
+++ b/drivers/net/ethernet/8390/etherh.c
@@ -45,7 +45,6 @@
45#include <linux/bitops.h> 45#include <linux/bitops.h>
46#include <linux/jiffies.h> 46#include <linux/jiffies.h>
47 47
48#include <asm/system.h>
49#include <asm/ecard.h> 48#include <asm/ecard.h>
50#include <asm/io.h> 49#include <asm/io.h>
51#include <asm/system_info.h> 50#include <asm/system_info.h>
diff --git a/drivers/net/ethernet/8390/hp-plus.c b/drivers/net/ethernet/8390/hp-plus.c
index d42938b6b596..52f70f999c00 100644
--- a/drivers/net/ethernet/8390/hp-plus.c
+++ b/drivers/net/ethernet/8390/hp-plus.c
@@ -33,7 +33,6 @@ static const char version[] =
33#include <linux/interrupt.h> 33#include <linux/interrupt.h>
34#include <linux/delay.h> 34#include <linux/delay.h>
35 35
36#include <asm/system.h>
37#include <asm/io.h> 36#include <asm/io.h>
38 37
39#include "8390.h" 38#include "8390.h"
diff --git a/drivers/net/ethernet/8390/hp.c b/drivers/net/ethernet/8390/hp.c
index 113f1e075a26..37fa89aa4578 100644
--- a/drivers/net/ethernet/8390/hp.c
+++ b/drivers/net/ethernet/8390/hp.c
@@ -33,7 +33,6 @@ static const char version[] =
33#include <linux/interrupt.h> 33#include <linux/interrupt.h>
34#include <linux/delay.h> 34#include <linux/delay.h>
35 35
36#include <asm/system.h>
37#include <asm/io.h> 36#include <asm/io.h>
38 37
39#include "8390.h" 38#include "8390.h"
diff --git a/drivers/net/ethernet/8390/lib8390.c b/drivers/net/ethernet/8390/lib8390.c
index e77f624e8194..b329f5c0d62b 100644
--- a/drivers/net/ethernet/8390/lib8390.c
+++ b/drivers/net/ethernet/8390/lib8390.c
@@ -57,7 +57,6 @@
57#include <linux/types.h> 57#include <linux/types.h>
58#include <linux/string.h> 58#include <linux/string.h>
59#include <linux/bitops.h> 59#include <linux/bitops.h>
60#include <asm/system.h>
61#include <linux/uaccess.h> 60#include <linux/uaccess.h>
62#include <linux/io.h> 61#include <linux/io.h>
63#include <asm/irq.h> 62#include <asm/irq.h>
diff --git a/drivers/net/ethernet/8390/lne390.c b/drivers/net/ethernet/8390/lne390.c
index 69490ae018ea..479409bf2e3c 100644
--- a/drivers/net/ethernet/8390/lne390.c
+++ b/drivers/net/ethernet/8390/lne390.c
@@ -46,7 +46,6 @@ static const char *version =
46#include <linux/etherdevice.h> 46#include <linux/etherdevice.h>
47 47
48#include <asm/io.h> 48#include <asm/io.h>
49#include <asm/system.h>
50 49
51#include "8390.h" 50#include "8390.h"
52 51
diff --git a/drivers/net/ethernet/8390/mac8390.c b/drivers/net/ethernet/8390/mac8390.c
index af5d9822cad9..88ccc8b14f0a 100644
--- a/drivers/net/ethernet/8390/mac8390.c
+++ b/drivers/net/ethernet/8390/mac8390.c
@@ -37,7 +37,6 @@
37#include <linux/bitops.h> 37#include <linux/bitops.h>
38#include <linux/io.h> 38#include <linux/io.h>
39 39
40#include <asm/system.h>
41#include <asm/dma.h> 40#include <asm/dma.h>
42#include <asm/hwtest.h> 41#include <asm/hwtest.h>
43#include <asm/macints.h> 42#include <asm/macints.h>
diff --git a/drivers/net/ethernet/8390/ne-h8300.c b/drivers/net/ethernet/8390/ne-h8300.c
index 9b9c77d5a65c..7fc28f2d28a6 100644
--- a/drivers/net/ethernet/8390/ne-h8300.c
+++ b/drivers/net/ethernet/8390/ne-h8300.c
@@ -29,7 +29,6 @@ static const char version1[] =
29#include <linux/etherdevice.h> 29#include <linux/etherdevice.h>
30#include <linux/jiffies.h> 30#include <linux/jiffies.h>
31 31
32#include <asm/system.h>
33#include <asm/io.h> 32#include <asm/io.h>
34#include <asm/irq.h> 33#include <asm/irq.h>
35 34
diff --git a/drivers/net/ethernet/8390/ne.c b/drivers/net/ethernet/8390/ne.c
index f92ea2a65a57..d04911d33b64 100644
--- a/drivers/net/ethernet/8390/ne.c
+++ b/drivers/net/ethernet/8390/ne.c
@@ -53,7 +53,6 @@ static const char version2[] =
53#include <linux/jiffies.h> 53#include <linux/jiffies.h>
54#include <linux/platform_device.h> 54#include <linux/platform_device.h>
55 55
56#include <asm/system.h>
57#include <asm/io.h> 56#include <asm/io.h>
58 57
59#include "8390.h" 58#include "8390.h"
diff --git a/drivers/net/ethernet/8390/ne2.c b/drivers/net/ethernet/8390/ne2.c
index 922b32036c63..ef85839f43d8 100644
--- a/drivers/net/ethernet/8390/ne2.c
+++ b/drivers/net/ethernet/8390/ne2.c
@@ -76,7 +76,6 @@ static const char *version = "ne2.c:v0.91 Nov 16 1998 Wim Dumon <wimpie@kotnet.o
76#include <linux/bitops.h> 76#include <linux/bitops.h>
77#include <linux/jiffies.h> 77#include <linux/jiffies.h>
78 78
79#include <asm/system.h>
80#include <asm/io.h> 79#include <asm/io.h>
81#include <asm/dma.h> 80#include <asm/dma.h>
82 81
diff --git a/drivers/net/ethernet/8390/ne2k-pci.c b/drivers/net/ethernet/8390/ne2k-pci.c
index 3fab04a0034a..5e8845febfb8 100644
--- a/drivers/net/ethernet/8390/ne2k-pci.c
+++ b/drivers/net/ethernet/8390/ne2k-pci.c
@@ -54,7 +54,6 @@ static int options[MAX_UNITS];
54#include <linux/netdevice.h> 54#include <linux/netdevice.h>
55#include <linux/etherdevice.h> 55#include <linux/etherdevice.h>
56 56
57#include <asm/system.h>
58#include <asm/io.h> 57#include <asm/io.h>
59#include <asm/irq.h> 58#include <asm/irq.h>
60#include <asm/uaccess.h> 59#include <asm/uaccess.h>
diff --git a/drivers/net/ethernet/8390/ne3210.c b/drivers/net/ethernet/8390/ne3210.c
index 2a3e8057feae..a2f8b2b8e27c 100644
--- a/drivers/net/ethernet/8390/ne3210.c
+++ b/drivers/net/ethernet/8390/ne3210.c
@@ -39,7 +39,6 @@
39#include <linux/mm.h> 39#include <linux/mm.h>
40 40
41#include <asm/io.h> 41#include <asm/io.h>
42#include <asm/system.h>
43 42
44#include "8390.h" 43#include "8390.h"
45 44
diff --git a/drivers/net/ethernet/8390/pcnet_cs.c b/drivers/net/ethernet/8390/pcnet_cs.c
index f2a4e5de18c4..de1af0bfed4c 100644
--- a/drivers/net/ethernet/8390/pcnet_cs.c
+++ b/drivers/net/ethernet/8390/pcnet_cs.c
@@ -49,7 +49,6 @@
49#include <pcmcia/cisreg.h> 49#include <pcmcia/cisreg.h>
50 50
51#include <asm/io.h> 51#include <asm/io.h>
52#include <asm/system.h>
53#include <asm/byteorder.h> 52#include <asm/byteorder.h>
54#include <asm/uaccess.h> 53#include <asm/uaccess.h>
55 54
diff --git a/drivers/net/ethernet/8390/smc-mca.c b/drivers/net/ethernet/8390/smc-mca.c
index 77efec44fea0..7a68590f2804 100644
--- a/drivers/net/ethernet/8390/smc-mca.c
+++ b/drivers/net/ethernet/8390/smc-mca.c
@@ -47,7 +47,6 @@
47#include <linux/etherdevice.h> 47#include <linux/etherdevice.h>
48 48
49#include <asm/io.h> 49#include <asm/io.h>
50#include <asm/system.h>
51 50
52#include "8390.h" 51#include "8390.h"
53 52
diff --git a/drivers/net/ethernet/8390/smc-ultra.c b/drivers/net/ethernet/8390/smc-ultra.c
index 1cc306a83ff7..b0fbce39661a 100644
--- a/drivers/net/ethernet/8390/smc-ultra.c
+++ b/drivers/net/ethernet/8390/smc-ultra.c
@@ -69,7 +69,6 @@ static const char version[] =
69 69
70#include <asm/io.h> 70#include <asm/io.h>
71#include <asm/irq.h> 71#include <asm/irq.h>
72#include <asm/system.h>
73 72
74#include "8390.h" 73#include "8390.h"
75 74
diff --git a/drivers/net/ethernet/8390/smc-ultra32.c b/drivers/net/ethernet/8390/smc-ultra32.c
index bb87053eb3da..923e42aedcfd 100644
--- a/drivers/net/ethernet/8390/smc-ultra32.c
+++ b/drivers/net/ethernet/8390/smc-ultra32.c
@@ -57,7 +57,6 @@ static const char *version = "smc-ultra32.c: 06/97 v1.00\n";
57#include <linux/etherdevice.h> 57#include <linux/etherdevice.h>
58 58
59#include <asm/io.h> 59#include <asm/io.h>
60#include <asm/system.h>
61 60
62#include "8390.h" 61#include "8390.h"
63 62
diff --git a/drivers/net/ethernet/8390/stnic.c b/drivers/net/ethernet/8390/stnic.c
index 3b903759980a..8df4c4157230 100644
--- a/drivers/net/ethernet/8390/stnic.c
+++ b/drivers/net/ethernet/8390/stnic.c
@@ -17,7 +17,6 @@
17#include <linux/init.h> 17#include <linux/init.h>
18#include <linux/delay.h> 18#include <linux/delay.h>
19 19
20#include <asm/system.h>
21#include <asm/io.h> 20#include <asm/io.h>
22#include <mach-se/mach/se.h> 21#include <mach-se/mach/se.h>
23#include <asm/machvec.h> 22#include <asm/machvec.h>
diff --git a/drivers/net/ethernet/8390/wd.c b/drivers/net/ethernet/8390/wd.c
index c175fadb597b..03eb3eed49fa 100644
--- a/drivers/net/ethernet/8390/wd.c
+++ b/drivers/net/ethernet/8390/wd.c
@@ -39,7 +39,6 @@ static const char version[] =
39#include <linux/etherdevice.h> 39#include <linux/etherdevice.h>
40 40
41#include <asm/io.h> 41#include <asm/io.h>
42#include <asm/system.h>
43 42
44#include "8390.h" 43#include "8390.h"
45 44
diff --git a/drivers/net/ethernet/8390/zorro8390.c b/drivers/net/ethernet/8390/zorro8390.c
index bcd27323b203..7818e6397e91 100644
--- a/drivers/net/ethernet/8390/zorro8390.c
+++ b/drivers/net/ethernet/8390/zorro8390.c
@@ -31,7 +31,6 @@
31#include <linux/zorro.h> 31#include <linux/zorro.h>
32#include <linux/jiffies.h> 32#include <linux/jiffies.h>
33 33
34#include <asm/system.h>
35#include <asm/irq.h> 34#include <asm/irq.h>
36#include <asm/amigaints.h> 35#include <asm/amigaints.h>
37#include <asm/amigahw.h> 36#include <asm/amigahw.h>
diff --git a/drivers/net/ethernet/alteon/acenic.c b/drivers/net/ethernet/alteon/acenic.c
index 6c3b1c0adaa0..7219123fa0a4 100644
--- a/drivers/net/ethernet/alteon/acenic.c
+++ b/drivers/net/ethernet/alteon/acenic.c
@@ -78,7 +78,6 @@
78#include <net/sock.h> 78#include <net/sock.h>
79#include <net/ip.h> 79#include <net/ip.h>
80 80
81#include <asm/system.h>
82#include <asm/io.h> 81#include <asm/io.h>
83#include <asm/irq.h> 82#include <asm/irq.h>
84#include <asm/byteorder.h> 83#include <asm/byteorder.h>
diff --git a/drivers/net/ethernet/amd/7990.c b/drivers/net/ethernet/amd/7990.c
index 1b046f58d58f..6e722dc37db7 100644
--- a/drivers/net/ethernet/amd/7990.c
+++ b/drivers/net/ethernet/amd/7990.c
@@ -33,7 +33,6 @@
33#include <linux/socket.h> 33#include <linux/socket.h>
34#include <linux/bitops.h> 34#include <linux/bitops.h>
35 35
36#include <asm/system.h>
37#include <asm/io.h> 36#include <asm/io.h>
38#include <asm/dma.h> 37#include <asm/dma.h>
39#include <asm/pgtable.h> 38#include <asm/pgtable.h>
diff --git a/drivers/net/ethernet/amd/am79c961a.c b/drivers/net/ethernet/amd/am79c961a.c
index cc7b9e46780c..e10ffad525a7 100644
--- a/drivers/net/ethernet/amd/am79c961a.c
+++ b/drivers/net/ethernet/amd/am79c961a.c
@@ -30,7 +30,6 @@
30#include <linux/io.h> 30#include <linux/io.h>
31 31
32#include <mach/hardware.h> 32#include <mach/hardware.h>
33#include <asm/system.h>
34 33
35#define TX_BUFFERS 15 34#define TX_BUFFERS 15
36#define RX_BUFFERS 25 35#define RX_BUFFERS 25
diff --git a/drivers/net/ethernet/amd/amd8111e.c b/drivers/net/ethernet/amd/amd8111e.c
index 9f62504d0086..64d0d9c1afa2 100644
--- a/drivers/net/ethernet/amd/amd8111e.c
+++ b/drivers/net/ethernet/amd/amd8111e.c
@@ -88,7 +88,6 @@ Revision History:
88#include <linux/crc32.h> 88#include <linux/crc32.h>
89#include <linux/dma-mapping.h> 89#include <linux/dma-mapping.h>
90 90
91#include <asm/system.h>
92#include <asm/io.h> 91#include <asm/io.h>
93#include <asm/byteorder.h> 92#include <asm/byteorder.h>
94#include <asm/uaccess.h> 93#include <asm/uaccess.h>
diff --git a/drivers/net/ethernet/amd/declance.c b/drivers/net/ethernet/amd/declance.c
index 7dc508e5c72e..75299f500ee5 100644
--- a/drivers/net/ethernet/amd/declance.c
+++ b/drivers/net/ethernet/amd/declance.c
@@ -64,7 +64,6 @@
64#include <linux/types.h> 64#include <linux/types.h>
65 65
66#include <asm/addrspace.h> 66#include <asm/addrspace.h>
67#include <asm/system.h>
68 67
69#include <asm/dec/interrupts.h> 68#include <asm/dec/interrupts.h>
70#include <asm/dec/ioasic.h> 69#include <asm/dec/ioasic.h>
diff --git a/drivers/net/ethernet/amd/hplance.c b/drivers/net/ethernet/amd/hplance.c
index 4e2d68a4de8a..8baff4e5d964 100644
--- a/drivers/net/ethernet/amd/hplance.c
+++ b/drivers/net/ethernet/amd/hplance.c
@@ -22,7 +22,6 @@
22#include <linux/etherdevice.h> 22#include <linux/etherdevice.h>
23#include <linux/skbuff.h> 23#include <linux/skbuff.h>
24 24
25#include <asm/system.h>
26#include <asm/io.h> 25#include <asm/io.h>
27#include <asm/pgtable.h> 26#include <asm/pgtable.h>
28 27
diff --git a/drivers/net/ethernet/amd/mvme147.c b/drivers/net/ethernet/amd/mvme147.c
index 56bc47a94186..9af3c307862c 100644
--- a/drivers/net/ethernet/amd/mvme147.c
+++ b/drivers/net/ethernet/amd/mvme147.c
@@ -22,7 +22,6 @@
22#include <linux/etherdevice.h> 22#include <linux/etherdevice.h>
23#include <linux/skbuff.h> 23#include <linux/skbuff.h>
24 24
25#include <asm/system.h>
26#include <asm/io.h> 25#include <asm/io.h>
27#include <asm/pgtable.h> 26#include <asm/pgtable.h>
28#include <asm/mvme147hw.h> 27#include <asm/mvme147hw.h>
diff --git a/drivers/net/ethernet/amd/nmclan_cs.c b/drivers/net/ethernet/amd/nmclan_cs.c
index ebdb9e238a8d..9f59bf63514b 100644
--- a/drivers/net/ethernet/amd/nmclan_cs.c
+++ b/drivers/net/ethernet/amd/nmclan_cs.c
@@ -154,7 +154,6 @@ Include Files
154 154
155#include <asm/uaccess.h> 155#include <asm/uaccess.h>
156#include <asm/io.h> 156#include <asm/io.h>
157#include <asm/system.h>
158 157
159/* ---------------------------------------------------------------------------- 158/* ----------------------------------------------------------------------------
160Defines 159Defines
diff --git a/drivers/net/ethernet/amd/sunlance.c b/drivers/net/ethernet/amd/sunlance.c
index e3fe3504e198..d7a3533d990b 100644
--- a/drivers/net/ethernet/amd/sunlance.c
+++ b/drivers/net/ethernet/amd/sunlance.c
@@ -95,7 +95,6 @@ static char lancestr[] = "LANCE";
95#include <linux/of_device.h> 95#include <linux/of_device.h>
96#include <linux/gfp.h> 96#include <linux/gfp.h>
97 97
98#include <asm/system.h>
99#include <asm/io.h> 98#include <asm/io.h>
100#include <asm/dma.h> 99#include <asm/dma.h>
101#include <asm/pgtable.h> 100#include <asm/pgtable.h>
diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c
index b0657466041d..a374f2788347 100644
--- a/drivers/net/ethernet/broadcom/tg3.c
+++ b/drivers/net/ethernet/broadcom/tg3.c
@@ -48,7 +48,6 @@
48#include <net/checksum.h> 48#include <net/checksum.h>
49#include <net/ip.h> 49#include <net/ip.h>
50 50
51#include <asm/system.h>
52#include <linux/io.h> 51#include <linux/io.h>
53#include <asm/byteorder.h> 52#include <asm/byteorder.h>
54#include <linux/uaccess.h> 53#include <linux/uaccess.h>
diff --git a/drivers/net/ethernet/cirrus/cs89x0.c b/drivers/net/ethernet/cirrus/cs89x0.c
index d5ff93653e4c..98c171b3a45e 100644
--- a/drivers/net/ethernet/cirrus/cs89x0.c
+++ b/drivers/net/ethernet/cirrus/cs89x0.c
@@ -148,7 +148,6 @@
148#include <linux/delay.h> 148#include <linux/delay.h>
149#include <linux/gfp.h> 149#include <linux/gfp.h>
150 150
151#include <asm/system.h>
152#include <asm/io.h> 151#include <asm/io.h>
153#include <asm/irq.h> 152#include <asm/irq.h>
154#if ALLOW_DMA 153#if ALLOW_DMA
diff --git a/drivers/net/ethernet/cirrus/mac89x0.c b/drivers/net/ethernet/cirrus/mac89x0.c
index 932fdccc339a..e285f384b096 100644
--- a/drivers/net/ethernet/cirrus/mac89x0.c
+++ b/drivers/net/ethernet/cirrus/mac89x0.c
@@ -99,7 +99,6 @@ static char *version =
99#include <linux/bitops.h> 99#include <linux/bitops.h>
100#include <linux/gfp.h> 100#include <linux/gfp.h>
101 101
102#include <asm/system.h>
103#include <asm/io.h> 102#include <asm/io.h>
104#include <asm/hwtest.h> 103#include <asm/hwtest.h>
105#include <asm/macints.h> 104#include <asm/macints.h>
diff --git a/drivers/net/ethernet/dlink/de600.c b/drivers/net/ethernet/dlink/de600.c
index 682750c052c8..414f0eea1049 100644
--- a/drivers/net/ethernet/dlink/de600.c
+++ b/drivers/net/ethernet/dlink/de600.c
@@ -46,7 +46,6 @@ static const char version[] = "de600.c: $Revision: 1.41-2.5 $, Bjorn Ekwall (bj
46#include <linux/interrupt.h> 46#include <linux/interrupt.h>
47#include <linux/ioport.h> 47#include <linux/ioport.h>
48#include <linux/in.h> 48#include <linux/in.h>
49#include <asm/system.h>
50#include <linux/errno.h> 49#include <linux/errno.h>
51#include <linux/init.h> 50#include <linux/init.h>
52#include <linux/delay.h> 51#include <linux/delay.h>
diff --git a/drivers/net/ethernet/dlink/de620.c b/drivers/net/ethernet/dlink/de620.c
index afc5aaac6b60..2e2bc60ee811 100644
--- a/drivers/net/ethernet/dlink/de620.c
+++ b/drivers/net/ethernet/dlink/de620.c
@@ -122,7 +122,6 @@ static const char version[] =
122#include <linux/skbuff.h> 122#include <linux/skbuff.h>
123 123
124#include <asm/io.h> 124#include <asm/io.h>
125#include <asm/system.h>
126 125
127/* Constant definitions for the DE-620 registers, commands and bits */ 126/* Constant definitions for the DE-620 registers, commands and bits */
128#include "de620.h" 127#include "de620.h"
diff --git a/drivers/net/ethernet/fujitsu/at1700.c b/drivers/net/ethernet/fujitsu/at1700.c
index 586b46fd4eed..3d94797c8f9b 100644
--- a/drivers/net/ethernet/fujitsu/at1700.c
+++ b/drivers/net/ethernet/fujitsu/at1700.c
@@ -52,7 +52,6 @@
52#include <linux/crc32.h> 52#include <linux/crc32.h>
53#include <linux/bitops.h> 53#include <linux/bitops.h>
54 54
55#include <asm/system.h>
56#include <asm/io.h> 55#include <asm/io.h>
57#include <asm/dma.h> 56#include <asm/dma.h>
58 57
diff --git a/drivers/net/ethernet/fujitsu/eth16i.c b/drivers/net/ethernet/fujitsu/eth16i.c
index c3f0178fb5cb..a992d1f7e0d2 100644
--- a/drivers/net/ethernet/fujitsu/eth16i.c
+++ b/drivers/net/ethernet/fujitsu/eth16i.c
@@ -163,7 +163,6 @@ static char *version =
163#include <linux/jiffies.h> 163#include <linux/jiffies.h>
164#include <linux/io.h> 164#include <linux/io.h>
165 165
166#include <asm/system.h>
167#include <asm/dma.h> 166#include <asm/dma.h>
168 167
169 168
diff --git a/drivers/net/ethernet/fujitsu/fmvj18x_cs.c b/drivers/net/ethernet/fujitsu/fmvj18x_cs.c
index 0230319ddb59..2418faf2251a 100644
--- a/drivers/net/ethernet/fujitsu/fmvj18x_cs.c
+++ b/drivers/net/ethernet/fujitsu/fmvj18x_cs.c
@@ -57,7 +57,6 @@
57 57
58#include <asm/uaccess.h> 58#include <asm/uaccess.h>
59#include <asm/io.h> 59#include <asm/io.h>
60#include <asm/system.h>
61 60
62/*====================================================================*/ 61/*====================================================================*/
63 62
diff --git a/drivers/net/ethernet/i825xx/3c507.c b/drivers/net/ethernet/i825xx/3c507.c
index ed6925f11479..e8984b059905 100644
--- a/drivers/net/ethernet/i825xx/3c507.c
+++ b/drivers/net/ethernet/i825xx/3c507.c
@@ -63,7 +63,6 @@ static const char version[] =
63 63
64#include <asm/dma.h> 64#include <asm/dma.h>
65#include <asm/io.h> 65#include <asm/io.h>
66#include <asm/system.h>
67#include <asm/uaccess.h> 66#include <asm/uaccess.h>
68 67
69/* use 0 for production, 1 for verification, 2..7 for debug */ 68/* use 0 for production, 1 for verification, 2..7 for debug */
diff --git a/drivers/net/ethernet/i825xx/3c527.c b/drivers/net/ethernet/i825xx/3c527.c
index ef43f3e951c5..278e791afe00 100644
--- a/drivers/net/ethernet/i825xx/3c527.c
+++ b/drivers/net/ethernet/i825xx/3c527.c
@@ -106,7 +106,6 @@ DRV_NAME ".c:v" DRV_VERSION " " DRV_RELDATE " Richard Procter <rnp@paradise.net.
106#include <linux/semaphore.h> 106#include <linux/semaphore.h>
107 107
108#include <asm/uaccess.h> 108#include <asm/uaccess.h>
109#include <asm/system.h>
110#include <asm/io.h> 109#include <asm/io.h>
111#include <asm/dma.h> 110#include <asm/dma.h>
112 111
diff --git a/drivers/net/ethernet/i825xx/eepro.c b/drivers/net/ethernet/i825xx/eepro.c
index 7a4ad4a07917..7f49fd54c521 100644
--- a/drivers/net/ethernet/i825xx/eepro.c
+++ b/drivers/net/ethernet/i825xx/eepro.c
@@ -148,7 +148,6 @@ static const char version[] =
148#include <linux/bitops.h> 148#include <linux/bitops.h>
149#include <linux/ethtool.h> 149#include <linux/ethtool.h>
150 150
151#include <asm/system.h>
152#include <asm/io.h> 151#include <asm/io.h>
153#include <asm/dma.h> 152#include <asm/dma.h>
154 153
diff --git a/drivers/net/ethernet/i825xx/eexpress.c b/drivers/net/ethernet/i825xx/eexpress.c
index 3fc649e54a32..cc2e66ad4436 100644
--- a/drivers/net/ethernet/i825xx/eexpress.c
+++ b/drivers/net/ethernet/i825xx/eexpress.c
@@ -116,7 +116,6 @@
116#include <linux/bitops.h> 116#include <linux/bitops.h>
117#include <linux/jiffies.h> 117#include <linux/jiffies.h>
118 118
119#include <asm/system.h>
120#include <asm/io.h> 119#include <asm/io.h>
121#include <asm/irq.h> 120#include <asm/irq.h>
122 121
diff --git a/drivers/net/ethernet/i825xx/ether1.c b/drivers/net/ethernet/i825xx/ether1.c
index 406a12b46404..067db3f13e91 100644
--- a/drivers/net/ethernet/i825xx/ether1.c
+++ b/drivers/net/ethernet/i825xx/ether1.c
@@ -48,7 +48,6 @@
48#include <linux/skbuff.h> 48#include <linux/skbuff.h>
49#include <linux/bitops.h> 49#include <linux/bitops.h>
50 50
51#include <asm/system.h>
52#include <asm/io.h> 51#include <asm/io.h>
53#include <asm/dma.h> 52#include <asm/dma.h>
54#include <asm/ecard.h> 53#include <asm/ecard.h>
diff --git a/drivers/net/ethernet/i825xx/znet.c b/drivers/net/ethernet/i825xx/znet.c
index a43649735a04..bd1f1ef91e19 100644
--- a/drivers/net/ethernet/i825xx/znet.c
+++ b/drivers/net/ethernet/i825xx/znet.c
@@ -100,7 +100,6 @@
100#include <linux/if_arp.h> 100#include <linux/if_arp.h>
101#include <linux/bitops.h> 101#include <linux/bitops.h>
102 102
103#include <asm/system.h>
104#include <asm/io.h> 103#include <asm/io.h>
105#include <asm/dma.h> 104#include <asm/dma.h>
106 105
diff --git a/drivers/net/ethernet/korina.c b/drivers/net/ethernet/korina.c
index f30db1c46600..bc58f1dc22f5 100644
--- a/drivers/net/ethernet/korina.c
+++ b/drivers/net/ethernet/korina.c
@@ -55,7 +55,6 @@
55#include <linux/crc32.h> 55#include <linux/crc32.h>
56 56
57#include <asm/bootinfo.h> 57#include <asm/bootinfo.h>
58#include <asm/system.h>
59#include <asm/bitops.h> 58#include <asm/bitops.h>
60#include <asm/pgtable.h> 59#include <asm/pgtable.h>
61#include <asm/io.h> 60#include <asm/io.h>
diff --git a/drivers/net/ethernet/marvell/mv643xx_eth.c b/drivers/net/ethernet/marvell/mv643xx_eth.c
index 75af1afe46c8..5e1ca0f05090 100644
--- a/drivers/net/ethernet/marvell/mv643xx_eth.c
+++ b/drivers/net/ethernet/marvell/mv643xx_eth.c
@@ -57,7 +57,6 @@
57#include <linux/types.h> 57#include <linux/types.h>
58#include <linux/inet_lro.h> 58#include <linux/inet_lro.h>
59#include <linux/slab.h> 59#include <linux/slab.h>
60#include <asm/system.h>
61 60
62static char mv643xx_eth_driver_name[] = "mv643xx_eth"; 61static char mv643xx_eth_driver_name[] = "mv643xx_eth";
63static char mv643xx_eth_driver_version[] = "1.4"; 62static char mv643xx_eth_driver_version[] = "1.4";
diff --git a/drivers/net/ethernet/marvell/pxa168_eth.c b/drivers/net/ethernet/marvell/pxa168_eth.c
index 45a6333588e6..efec6b60b327 100644
--- a/drivers/net/ethernet/marvell/pxa168_eth.c
+++ b/drivers/net/ethernet/marvell/pxa168_eth.c
@@ -43,7 +43,6 @@
43#include <linux/interrupt.h> 43#include <linux/interrupt.h>
44#include <linux/types.h> 44#include <linux/types.h>
45#include <asm/pgtable.h> 45#include <asm/pgtable.h>
46#include <asm/system.h>
47#include <asm/cacheflush.h> 46#include <asm/cacheflush.h>
48#include <linux/pxa168_eth.h> 47#include <linux/pxa168_eth.h>
49 48
diff --git a/drivers/net/ethernet/natsemi/jazzsonic.c b/drivers/net/ethernet/natsemi/jazzsonic.c
index 5b89fd377ae3..95dd39ffb230 100644
--- a/drivers/net/ethernet/natsemi/jazzsonic.c
+++ b/drivers/net/ethernet/natsemi/jazzsonic.c
@@ -38,7 +38,6 @@
38#include <linux/slab.h> 38#include <linux/slab.h>
39 39
40#include <asm/bootinfo.h> 40#include <asm/bootinfo.h>
41#include <asm/system.h>
42#include <asm/pgtable.h> 41#include <asm/pgtable.h>
43#include <asm/io.h> 42#include <asm/io.h>
44#include <asm/dma.h> 43#include <asm/dma.h>
diff --git a/drivers/net/ethernet/natsemi/macsonic.c b/drivers/net/ethernet/natsemi/macsonic.c
index e640e23460de..b9680ba5a325 100644
--- a/drivers/net/ethernet/natsemi/macsonic.c
+++ b/drivers/net/ethernet/natsemi/macsonic.c
@@ -53,7 +53,6 @@
53#include <linux/slab.h> 53#include <linux/slab.h>
54 54
55#include <asm/bootinfo.h> 55#include <asm/bootinfo.h>
56#include <asm/system.h>
57#include <asm/pgtable.h> 56#include <asm/pgtable.h>
58#include <asm/io.h> 57#include <asm/io.h>
59#include <asm/hwtest.h> 58#include <asm/hwtest.h>
diff --git a/drivers/net/ethernet/natsemi/ns83820.c b/drivers/net/ethernet/natsemi/ns83820.c
index c24b46cbfe27..d52728b3c436 100644
--- a/drivers/net/ethernet/natsemi/ns83820.c
+++ b/drivers/net/ethernet/natsemi/ns83820.c
@@ -121,7 +121,6 @@
121 121
122#include <asm/io.h> 122#include <asm/io.h>
123#include <asm/uaccess.h> 123#include <asm/uaccess.h>
124#include <asm/system.h>
125 124
126#define DRV_NAME "ns83820" 125#define DRV_NAME "ns83820"
127 126
diff --git a/drivers/net/ethernet/neterion/s2io.c b/drivers/net/ethernet/neterion/s2io.c
index 22a8de00bf02..6338ef8606ae 100644
--- a/drivers/net/ethernet/neterion/s2io.c
+++ b/drivers/net/ethernet/neterion/s2io.c
@@ -81,7 +81,6 @@
81#include <linux/prefetch.h> 81#include <linux/prefetch.h>
82#include <net/tcp.h> 82#include <net/tcp.h>
83 83
84#include <asm/system.h>
85#include <asm/div64.h> 84#include <asm/div64.h>
86#include <asm/irq.h> 85#include <asm/irq.h>
87 86
diff --git a/drivers/net/ethernet/nvidia/forcedeth.c b/drivers/net/ethernet/nvidia/forcedeth.c
index 8561dd25db66..aca13046e432 100644
--- a/drivers/net/ethernet/nvidia/forcedeth.c
+++ b/drivers/net/ethernet/nvidia/forcedeth.c
@@ -69,7 +69,6 @@
69#include <linux/io.h> 69#include <linux/io.h>
70 70
71#include <asm/irq.h> 71#include <asm/irq.h>
72#include <asm/system.h>
73 72
74#define TX_WORK_PER_LOOP 64 73#define TX_WORK_PER_LOOP 64
75#define RX_WORK_PER_LOOP 64 74#define RX_WORK_PER_LOOP 64
diff --git a/drivers/net/ethernet/realtek/atp.c b/drivers/net/ethernet/realtek/atp.c
index 46c1932048cb..e02f04d7f3ad 100644
--- a/drivers/net/ethernet/realtek/atp.c
+++ b/drivers/net/ethernet/realtek/atp.c
@@ -140,7 +140,6 @@ static int xcvr[NUM_UNITS]; /* The data transfer mode. */
140#include <linux/delay.h> 140#include <linux/delay.h>
141#include <linux/bitops.h> 141#include <linux/bitops.h>
142 142
143#include <asm/system.h>
144#include <asm/io.h> 143#include <asm/io.h>
145#include <asm/dma.h> 144#include <asm/dma.h>
146 145
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
index 27c358c8f4dc..7b23554f80b6 100644
--- a/drivers/net/ethernet/realtek/r8169.c
+++ b/drivers/net/ethernet/realtek/r8169.c
@@ -29,7 +29,6 @@
29#include <linux/pci-aspm.h> 29#include <linux/pci-aspm.h>
30#include <linux/prefetch.h> 30#include <linux/prefetch.h>
31 31
32#include <asm/system.h>
33#include <asm/io.h> 32#include <asm/io.h>
34#include <asm/irq.h> 33#include <asm/irq.h>
35 34
diff --git a/drivers/net/ethernet/seeq/ether3.c b/drivers/net/ethernet/seeq/ether3.c
index 7b819bd8c416..df808ac8cb65 100644
--- a/drivers/net/ethernet/seeq/ether3.c
+++ b/drivers/net/ethernet/seeq/ether3.c
@@ -64,7 +64,6 @@
64#include <linux/delay.h> 64#include <linux/delay.h>
65#include <linux/bitops.h> 65#include <linux/bitops.h>
66 66
67#include <asm/system.h>
68#include <asm/ecard.h> 67#include <asm/ecard.h>
69#include <asm/io.h> 68#include <asm/io.h>
70 69
diff --git a/drivers/net/ethernet/seeq/seeq8005.c b/drivers/net/ethernet/seeq/seeq8005.c
index 798990774446..698edbbfc149 100644
--- a/drivers/net/ethernet/seeq/seeq8005.c
+++ b/drivers/net/ethernet/seeq/seeq8005.c
@@ -47,7 +47,6 @@ static const char version[] =
47#include <linux/bitops.h> 47#include <linux/bitops.h>
48#include <linux/jiffies.h> 48#include <linux/jiffies.h>
49 49
50#include <asm/system.h>
51#include <asm/io.h> 50#include <asm/io.h>
52#include <asm/dma.h> 51#include <asm/dma.h>
53 52
diff --git a/drivers/net/ethernet/smsc/smc91c92_cs.c b/drivers/net/ethernet/smsc/smc91c92_cs.c
index d12e48a7861d..04393b5fef71 100644
--- a/drivers/net/ethernet/smsc/smc91c92_cs.c
+++ b/drivers/net/ethernet/smsc/smc91c92_cs.c
@@ -53,7 +53,6 @@
53#include <pcmcia/ss.h> 53#include <pcmcia/ss.h>
54 54
55#include <asm/io.h> 55#include <asm/io.h>
56#include <asm/system.h>
57#include <asm/uaccess.h> 56#include <asm/uaccess.h>
58 57
59/*====================================================================*/ 58/*====================================================================*/
diff --git a/drivers/net/ethernet/sun/cassini.c b/drivers/net/ethernet/sun/cassini.c
index 3c2295560732..ce4df61b4b56 100644
--- a/drivers/net/ethernet/sun/cassini.c
+++ b/drivers/net/ethernet/sun/cassini.c
@@ -99,7 +99,6 @@
99#include <net/checksum.h> 99#include <net/checksum.h>
100 100
101#include <linux/atomic.h> 101#include <linux/atomic.h>
102#include <asm/system.h>
103#include <asm/io.h> 102#include <asm/io.h>
104#include <asm/byteorder.h> 103#include <asm/byteorder.h>
105#include <asm/uaccess.h> 104#include <asm/uaccess.h>
diff --git a/drivers/net/ethernet/sun/sunbmac.c b/drivers/net/ethernet/sun/sunbmac.c
index f359863b5340..2a83fc57edba 100644
--- a/drivers/net/ethernet/sun/sunbmac.c
+++ b/drivers/net/ethernet/sun/sunbmac.c
@@ -35,7 +35,6 @@
35#include <asm/openprom.h> 35#include <asm/openprom.h>
36#include <asm/oplib.h> 36#include <asm/oplib.h>
37#include <asm/pgtable.h> 37#include <asm/pgtable.h>
38#include <asm/system.h>
39 38
40#include "sunbmac.h" 39#include "sunbmac.h"
41 40
diff --git a/drivers/net/ethernet/sun/sungem.c b/drivers/net/ethernet/sun/sungem.c
index ba041596e046..558409ff4058 100644
--- a/drivers/net/ethernet/sun/sungem.c
+++ b/drivers/net/ethernet/sun/sungem.c
@@ -41,7 +41,6 @@
41#include <linux/mm.h> 41#include <linux/mm.h>
42#include <linux/gfp.h> 42#include <linux/gfp.h>
43 43
44#include <asm/system.h>
45#include <asm/io.h> 44#include <asm/io.h>
46#include <asm/byteorder.h> 45#include <asm/byteorder.h>
47#include <asm/uaccess.h> 46#include <asm/uaccess.h>
diff --git a/drivers/net/ethernet/sun/sunhme.c b/drivers/net/ethernet/sun/sunhme.c
index 8b627e2f798d..b95e7e681b38 100644
--- a/drivers/net/ethernet/sun/sunhme.c
+++ b/drivers/net/ethernet/sun/sunhme.c
@@ -36,7 +36,6 @@
36#include <linux/bitops.h> 36#include <linux/bitops.h>
37#include <linux/dma-mapping.h> 37#include <linux/dma-mapping.h>
38 38
39#include <asm/system.h>
40#include <asm/io.h> 39#include <asm/io.h>
41#include <asm/dma.h> 40#include <asm/dma.h>
42#include <asm/byteorder.h> 41#include <asm/byteorder.h>
diff --git a/drivers/net/ethernet/sun/sunqe.c b/drivers/net/ethernet/sun/sunqe.c
index 139d6b410d68..7d4a040d84a2 100644
--- a/drivers/net/ethernet/sun/sunqe.c
+++ b/drivers/net/ethernet/sun/sunqe.c
@@ -28,7 +28,6 @@
28#include <linux/of.h> 28#include <linux/of.h>
29#include <linux/of_device.h> 29#include <linux/of_device.h>
30 30
31#include <asm/system.h>
32#include <asm/io.h> 31#include <asm/io.h>
33#include <asm/dma.h> 32#include <asm/dma.h>
34#include <asm/byteorder.h> 33#include <asm/byteorder.h>
diff --git a/drivers/net/ethernet/tundra/tsi108_eth.c b/drivers/net/ethernet/tundra/tsi108_eth.c
index 840e0e9031f5..277c93e9ff4d 100644
--- a/drivers/net/ethernet/tundra/tsi108_eth.c
+++ b/drivers/net/ethernet/tundra/tsi108_eth.c
@@ -50,7 +50,6 @@
50#include <linux/platform_device.h> 50#include <linux/platform_device.h>
51#include <linux/gfp.h> 51#include <linux/gfp.h>
52 52
53#include <asm/system.h>
54#include <asm/io.h> 53#include <asm/io.h>
55#include <asm/tsi108.h> 54#include <asm/tsi108.h>
56 55
diff --git a/drivers/net/ethernet/xircom/xirc2ps_cs.c b/drivers/net/ethernet/xircom/xirc2ps_cs.c
index 5c69c6f93fb8..94a1f94f74b8 100644
--- a/drivers/net/ethernet/xircom/xirc2ps_cs.c
+++ b/drivers/net/ethernet/xircom/xirc2ps_cs.c
@@ -89,7 +89,6 @@
89#include <pcmcia/ciscode.h> 89#include <pcmcia/ciscode.h>
90 90
91#include <asm/io.h> 91#include <asm/io.h>
92#include <asm/system.h>
93#include <asm/uaccess.h> 92#include <asm/uaccess.h>
94 93
95#ifndef MANFID_COMPAQ 94#ifndef MANFID_COMPAQ
diff --git a/drivers/net/hamradio/6pack.c b/drivers/net/hamradio/6pack.c
index 2a5a34d2d67b..64783a0d545a 100644
--- a/drivers/net/hamradio/6pack.c
+++ b/drivers/net/hamradio/6pack.c
@@ -13,7 +13,6 @@
13 */ 13 */
14 14
15#include <linux/module.h> 15#include <linux/module.h>
16#include <asm/system.h>
17#include <asm/uaccess.h> 16#include <asm/uaccess.h>
18#include <linux/bitops.h> 17#include <linux/bitops.h>
19#include <linux/string.h> 18#include <linux/string.h>
diff --git a/drivers/net/hamradio/baycom_par.c b/drivers/net/hamradio/baycom_par.c
index f1aea0c98333..acb636963e90 100644
--- a/drivers/net/hamradio/baycom_par.c
+++ b/drivers/net/hamradio/baycom_par.c
@@ -86,7 +86,6 @@
86#include <linux/bitops.h> 86#include <linux/bitops.h>
87#include <linux/jiffies.h> 87#include <linux/jiffies.h>
88 88
89#include <asm/system.h>
90#include <asm/uaccess.h> 89#include <asm/uaccess.h>
91 90
92/* --------------------------------------------------------------------- */ 91/* --------------------------------------------------------------------- */
diff --git a/drivers/net/hamradio/bpqether.c b/drivers/net/hamradio/bpqether.c
index 18d8affecd1b..76d54774ba82 100644
--- a/drivers/net/hamradio/bpqether.c
+++ b/drivers/net/hamradio/bpqether.c
@@ -69,7 +69,6 @@
69#include <linux/if_arp.h> 69#include <linux/if_arp.h>
70#include <linux/skbuff.h> 70#include <linux/skbuff.h>
71#include <net/sock.h> 71#include <net/sock.h>
72#include <asm/system.h>
73#include <asm/uaccess.h> 72#include <asm/uaccess.h>
74#include <linux/mm.h> 73#include <linux/mm.h>
75#include <linux/interrupt.h> 74#include <linux/interrupt.h>
diff --git a/drivers/net/hamradio/mkiss.c b/drivers/net/hamradio/mkiss.c
index bc02968cee16..aed1a6105b24 100644
--- a/drivers/net/hamradio/mkiss.c
+++ b/drivers/net/hamradio/mkiss.c
@@ -17,7 +17,6 @@
17 * Copyright (C) 2004, 05 Thomas Osterried DL9SAU <thomas@x-berg.in-berlin.de> 17 * Copyright (C) 2004, 05 Thomas Osterried DL9SAU <thomas@x-berg.in-berlin.de>
18 */ 18 */
19#include <linux/module.h> 19#include <linux/module.h>
20#include <asm/system.h>
21#include <linux/bitops.h> 20#include <linux/bitops.h>
22#include <asm/uaccess.h> 21#include <asm/uaccess.h>
23#include <linux/crc16.h> 22#include <linux/crc16.h>
diff --git a/drivers/net/hamradio/scc.c b/drivers/net/hamradio/scc.c
index 33655814448e..efc6c97163a7 100644
--- a/drivers/net/hamradio/scc.c
+++ b/drivers/net/hamradio/scc.c
@@ -177,7 +177,6 @@
177#include <net/ax25.h> 177#include <net/ax25.h>
178 178
179#include <asm/irq.h> 179#include <asm/irq.h>
180#include <asm/system.h>
181#include <asm/io.h> 180#include <asm/io.h>
182#include <asm/uaccess.h> 181#include <asm/uaccess.h>
183 182
diff --git a/drivers/net/hamradio/yam.c b/drivers/net/hamradio/yam.c
index 696327773fbe..5a6412ecce73 100644
--- a/drivers/net/hamradio/yam.c
+++ b/drivers/net/hamradio/yam.c
@@ -52,7 +52,6 @@
52#include <linux/bitops.h> 52#include <linux/bitops.h>
53#include <linux/random.h> 53#include <linux/random.h>
54#include <asm/io.h> 54#include <asm/io.h>
55#include <asm/system.h>
56#include <linux/interrupt.h> 55#include <linux/interrupt.h>
57#include <linux/ioport.h> 56#include <linux/ioport.h>
58#include <linux/firmware.h> 57#include <linux/firmware.h>
diff --git a/drivers/net/hippi/rrunner.c b/drivers/net/hippi/rrunner.c
index 2a51363d9fed..168c8f41d09f 100644
--- a/drivers/net/hippi/rrunner.c
+++ b/drivers/net/hippi/rrunner.c
@@ -43,7 +43,6 @@
43#include <linux/slab.h> 43#include <linux/slab.h>
44#include <net/sock.h> 44#include <net/sock.h>
45 45
46#include <asm/system.h>
47#include <asm/cache.h> 46#include <asm/cache.h>
48#include <asm/byteorder.h> 47#include <asm/byteorder.h>
49#include <asm/io.h> 48#include <asm/io.h>
diff --git a/drivers/net/irda/donauboe.c b/drivers/net/irda/donauboe.c
index 617a446d126c..4351296dde32 100644
--- a/drivers/net/irda/donauboe.c
+++ b/drivers/net/irda/donauboe.c
@@ -156,7 +156,6 @@
156#include <linux/pci.h> 156#include <linux/pci.h>
157#include <linux/rtnetlink.h> 157#include <linux/rtnetlink.h>
158 158
159#include <asm/system.h>
160#include <asm/io.h> 159#include <asm/io.h>
161 160
162#include <net/irda/wrapper.h> 161#include <net/irda/wrapper.h>
diff --git a/drivers/net/loopback.c b/drivers/net/loopback.c
index b71998d0b5b4..32eb94ece6c1 100644
--- a/drivers/net/loopback.c
+++ b/drivers/net/loopback.c
@@ -41,7 +41,6 @@
41#include <linux/in.h> 41#include <linux/in.h>
42#include <linux/init.h> 42#include <linux/init.h>
43 43
44#include <asm/system.h>
45#include <asm/uaccess.h> 44#include <asm/uaccess.h>
46#include <asm/io.h> 45#include <asm/io.h>
47 46
diff --git a/drivers/net/plip/plip.c b/drivers/net/plip/plip.c
index 1a5a316cc968..bed62d9c53c8 100644
--- a/drivers/net/plip/plip.c
+++ b/drivers/net/plip/plip.c
@@ -113,7 +113,6 @@ static const char version[] = "NET3 PLIP version 2.4-parport gniibe@mri.co.jp\n"
113 113
114#include <net/neighbour.h> 114#include <net/neighbour.h>
115 115
116#include <asm/system.h>
117#include <asm/irq.h> 116#include <asm/irq.h>
118#include <asm/byteorder.h> 117#include <asm/byteorder.h>
119 118
diff --git a/drivers/net/slip/slhc.c b/drivers/net/slip/slhc.c
index 0a0a6643cf3a..1252d9c726a7 100644
--- a/drivers/net/slip/slhc.c
+++ b/drivers/net/slip/slhc.c
@@ -75,7 +75,6 @@
75#include <linux/skbuff.h> 75#include <linux/skbuff.h>
76#include <net/sock.h> 76#include <net/sock.h>
77#include <linux/timer.h> 77#include <linux/timer.h>
78#include <asm/system.h>
79#include <asm/uaccess.h> 78#include <asm/uaccess.h>
80#include <net/checksum.h> 79#include <net/checksum.h>
81#include <asm/unaligned.h> 80#include <asm/unaligned.h>
diff --git a/drivers/net/slip/slip.c b/drivers/net/slip/slip.c
index 69345dfae0fd..d4c9db3da22a 100644
--- a/drivers/net/slip/slip.c
+++ b/drivers/net/slip/slip.c
@@ -64,7 +64,6 @@
64#include <linux/module.h> 64#include <linux/module.h>
65#include <linux/moduleparam.h> 65#include <linux/moduleparam.h>
66 66
67#include <asm/system.h>
68#include <asm/uaccess.h> 67#include <asm/uaccess.h>
69#include <linux/bitops.h> 68#include <linux/bitops.h>
70#include <linux/sched.h> 69#include <linux/sched.h>
diff --git a/drivers/net/tokenring/3c359.c b/drivers/net/tokenring/3c359.c
index d7c292aa76b1..b15ac81d46fa 100644
--- a/drivers/net/tokenring/3c359.c
+++ b/drivers/net/tokenring/3c359.c
@@ -68,7 +68,6 @@
68#include <net/checksum.h> 68#include <net/checksum.h>
69 69
70#include <asm/io.h> 70#include <asm/io.h>
71#include <asm/system.h>
72 71
73#include "3c359.h" 72#include "3c359.h"
74 73
diff --git a/drivers/net/tokenring/abyss.c b/drivers/net/tokenring/abyss.c
index 515f122777ab..b715e6b444da 100644
--- a/drivers/net/tokenring/abyss.c
+++ b/drivers/net/tokenring/abyss.c
@@ -33,7 +33,6 @@
33#include <linux/netdevice.h> 33#include <linux/netdevice.h>
34#include <linux/trdevice.h> 34#include <linux/trdevice.h>
35 35
36#include <asm/system.h>
37#include <asm/io.h> 36#include <asm/io.h>
38#include <asm/irq.h> 37#include <asm/irq.h>
39 38
diff --git a/drivers/net/tokenring/ibmtr_cs.c b/drivers/net/tokenring/ibmtr_cs.c
index 91b684630fc5..356e28e4881b 100644
--- a/drivers/net/tokenring/ibmtr_cs.c
+++ b/drivers/net/tokenring/ibmtr_cs.c
@@ -63,7 +63,6 @@
63 63
64#include <asm/uaccess.h> 64#include <asm/uaccess.h>
65#include <asm/io.h> 65#include <asm/io.h>
66#include <asm/system.h>
67 66
68#define PCMCIA 67#define PCMCIA
69#include "ibmtr.c" 68#include "ibmtr.c"
diff --git a/drivers/net/tokenring/lanstreamer.c b/drivers/net/tokenring/lanstreamer.c
index 8d71e0d29062..3e4b4f091113 100644
--- a/drivers/net/tokenring/lanstreamer.c
+++ b/drivers/net/tokenring/lanstreamer.c
@@ -127,7 +127,6 @@
127#include <net/checksum.h> 127#include <net/checksum.h>
128 128
129#include <asm/io.h> 129#include <asm/io.h>
130#include <asm/system.h>
131 130
132#include "lanstreamer.h" 131#include "lanstreamer.h"
133 132
diff --git a/drivers/net/tokenring/madgemc.c b/drivers/net/tokenring/madgemc.c
index 1cdc034f6aec..28adcdf3b14c 100644
--- a/drivers/net/tokenring/madgemc.c
+++ b/drivers/net/tokenring/madgemc.c
@@ -28,7 +28,6 @@ static const char version[] = "madgemc.c: v0.91 23/01/2000 by Adam Fritzler\n";
28#include <linux/netdevice.h> 28#include <linux/netdevice.h>
29#include <linux/trdevice.h> 29#include <linux/trdevice.h>
30 30
31#include <asm/system.h>
32#include <asm/io.h> 31#include <asm/io.h>
33#include <asm/irq.h> 32#include <asm/irq.h>
34 33
diff --git a/drivers/net/tokenring/olympic.c b/drivers/net/tokenring/olympic.c
index fd8dce90c957..0e234741cc79 100644
--- a/drivers/net/tokenring/olympic.c
+++ b/drivers/net/tokenring/olympic.c
@@ -106,7 +106,6 @@
106#include <net/net_namespace.h> 106#include <net/net_namespace.h>
107 107
108#include <asm/io.h> 108#include <asm/io.h>
109#include <asm/system.h>
110 109
111#include "olympic.h" 110#include "olympic.h"
112 111
diff --git a/drivers/net/tokenring/proteon.c b/drivers/net/tokenring/proteon.c
index 8d362e64a40e..62d90e40f9ec 100644
--- a/drivers/net/tokenring/proteon.c
+++ b/drivers/net/tokenring/proteon.c
@@ -31,7 +31,6 @@ static const char version[] = "proteon.c: v1.00 02/01/2003 by Jochen Friedrich\n
31#include <linux/trdevice.h> 31#include <linux/trdevice.h>
32#include <linux/platform_device.h> 32#include <linux/platform_device.h>
33 33
34#include <asm/system.h>
35#include <asm/io.h> 34#include <asm/io.h>
36#include <asm/irq.h> 35#include <asm/irq.h>
37#include <asm/pci.h> 36#include <asm/pci.h>
diff --git a/drivers/net/tokenring/skisa.c b/drivers/net/tokenring/skisa.c
index 46db5c5395b2..ee11e93dc30e 100644
--- a/drivers/net/tokenring/skisa.c
+++ b/drivers/net/tokenring/skisa.c
@@ -38,7 +38,6 @@ static const char version[] = "skisa.c: v1.03 09/12/2002 by Jochen Friedrich\n";
38#include <linux/trdevice.h> 38#include <linux/trdevice.h>
39#include <linux/platform_device.h> 39#include <linux/platform_device.h>
40 40
41#include <asm/system.h>
42#include <asm/io.h> 41#include <asm/io.h>
43#include <asm/irq.h> 42#include <asm/irq.h>
44#include <asm/pci.h> 43#include <asm/pci.h>
diff --git a/drivers/net/tokenring/smctr.c b/drivers/net/tokenring/smctr.c
index 029846a98636..cb35fb79e016 100644
--- a/drivers/net/tokenring/smctr.c
+++ b/drivers/net/tokenring/smctr.c
@@ -49,7 +49,6 @@
49#include <linux/bitops.h> 49#include <linux/bitops.h>
50#include <linux/firmware.h> 50#include <linux/firmware.h>
51 51
52#include <asm/system.h>
53#include <asm/io.h> 52#include <asm/io.h>
54#include <asm/dma.h> 53#include <asm/dma.h>
55#include <asm/irq.h> 54#include <asm/irq.h>
diff --git a/drivers/net/tokenring/tms380tr.c b/drivers/net/tokenring/tms380tr.c
index 102f896bbc58..be4813e0366c 100644
--- a/drivers/net/tokenring/tms380tr.c
+++ b/drivers/net/tokenring/tms380tr.c
@@ -98,7 +98,6 @@ static const char version[] = "tms380tr.c: v1.10 30/12/2002 by Christoph Goos, A
98#include <linux/firmware.h> 98#include <linux/firmware.h>
99#include <linux/bitops.h> 99#include <linux/bitops.h>
100 100
101#include <asm/system.h>
102#include <asm/io.h> 101#include <asm/io.h>
103#include <asm/dma.h> 102#include <asm/dma.h>
104#include <asm/irq.h> 103#include <asm/irq.h>
diff --git a/drivers/net/tokenring/tmspci.c b/drivers/net/tokenring/tmspci.c
index d3e788a9cd1c..fb9918da5792 100644
--- a/drivers/net/tokenring/tmspci.c
+++ b/drivers/net/tokenring/tmspci.c
@@ -34,7 +34,6 @@
34#include <linux/netdevice.h> 34#include <linux/netdevice.h>
35#include <linux/trdevice.h> 35#include <linux/trdevice.h>
36 36
37#include <asm/system.h>
38#include <asm/io.h> 37#include <asm/io.h>
39#include <asm/irq.h> 38#include <asm/irq.h>
40 39
diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index 74d7f76d14a3..bb8c72c79c6f 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -69,7 +69,6 @@
69#include <net/rtnetlink.h> 69#include <net/rtnetlink.h>
70#include <net/sock.h> 70#include <net/sock.h>
71 71
72#include <asm/system.h>
73#include <asm/uaccess.h> 72#include <asm/uaccess.h>
74 73
75/* Uncomment to enable debugging */ 74/* Uncomment to enable debugging */
diff --git a/drivers/net/wan/dlci.c b/drivers/net/wan/dlci.c
index 48ab38a34c5a..147614ed86aa 100644
--- a/drivers/net/wan/dlci.c
+++ b/drivers/net/wan/dlci.c
@@ -50,7 +50,6 @@
50 50
51#include <net/sock.h> 51#include <net/sock.h>
52 52
53#include <asm/system.h>
54#include <asm/io.h> 53#include <asm/io.h>
55#include <asm/dma.h> 54#include <asm/dma.h>
56#include <asm/uaccess.h> 55#include <asm/uaccess.h>
diff --git a/drivers/net/wan/dscc4.c b/drivers/net/wan/dscc4.c
index fe8d060d8fff..c676de7de024 100644
--- a/drivers/net/wan/dscc4.c
+++ b/drivers/net/wan/dscc4.c
@@ -93,7 +93,6 @@
93#include <linux/mm.h> 93#include <linux/mm.h>
94#include <linux/slab.h> 94#include <linux/slab.h>
95 95
96#include <asm/system.h>
97#include <asm/cache.h> 96#include <asm/cache.h>
98#include <asm/byteorder.h> 97#include <asm/byteorder.h>
99#include <asm/uaccess.h> 98#include <asm/uaccess.h>
diff --git a/drivers/net/wan/hd64570.c b/drivers/net/wan/hd64570.c
index 33b67d88fceb..cf4903355a34 100644
--- a/drivers/net/wan/hd64570.c
+++ b/drivers/net/wan/hd64570.c
@@ -40,7 +40,6 @@
40#include <linux/string.h> 40#include <linux/string.h>
41#include <linux/types.h> 41#include <linux/types.h>
42#include <asm/io.h> 42#include <asm/io.h>
43#include <asm/system.h>
44#include <asm/uaccess.h> 43#include <asm/uaccess.h>
45#include "hd64570.h" 44#include "hd64570.h"
46 45
diff --git a/drivers/net/wan/hd64572.c b/drivers/net/wan/hd64572.c
index efc0db101183..e2779faa6c4f 100644
--- a/drivers/net/wan/hd64572.c
+++ b/drivers/net/wan/hd64572.c
@@ -40,7 +40,6 @@
40#include <linux/string.h> 40#include <linux/string.h>
41#include <linux/types.h> 41#include <linux/types.h>
42#include <asm/io.h> 42#include <asm/io.h>
43#include <asm/system.h>
44#include <asm/uaccess.h> 43#include <asm/uaccess.h>
45#include "hd64572.h" 44#include "hd64572.h"
46 45
diff --git a/drivers/net/wan/lapbether.c b/drivers/net/wan/lapbether.c
index 7beeb9b88a3b..a73b49eb87e3 100644
--- a/drivers/net/wan/lapbether.c
+++ b/drivers/net/wan/lapbether.c
@@ -35,7 +35,6 @@
35#include <linux/if_arp.h> 35#include <linux/if_arp.h>
36#include <linux/skbuff.h> 36#include <linux/skbuff.h>
37#include <net/sock.h> 37#include <net/sock.h>
38#include <asm/system.h>
39#include <asm/uaccess.h> 38#include <asm/uaccess.h>
40#include <linux/mm.h> 39#include <linux/mm.h>
41#include <linux/interrupt.h> 40#include <linux/interrupt.h>
diff --git a/drivers/net/wan/sdla.c b/drivers/net/wan/sdla.c
index c8531612eea9..de3bbf43fc5a 100644
--- a/drivers/net/wan/sdla.c
+++ b/drivers/net/wan/sdla.c
@@ -54,7 +54,6 @@
54#include <linux/sdla.h> 54#include <linux/sdla.h>
55#include <linux/bitops.h> 55#include <linux/bitops.h>
56 56
57#include <asm/system.h>
58#include <asm/io.h> 57#include <asm/io.h>
59#include <asm/dma.h> 58#include <asm/dma.h>
60#include <asm/uaccess.h> 59#include <asm/uaccess.h>
diff --git a/drivers/net/wan/x25_asy.c b/drivers/net/wan/x25_asy.c
index e862369b4a6d..d7a65e141d1a 100644
--- a/drivers/net/wan/x25_asy.c
+++ b/drivers/net/wan/x25_asy.c
@@ -18,7 +18,6 @@
18 18
19#include <linux/module.h> 19#include <linux/module.h>
20 20
21#include <asm/system.h>
22#include <linux/uaccess.h> 21#include <linux/uaccess.h>
23#include <linux/bitops.h> 22#include <linux/bitops.h>
24#include <linux/string.h> 23#include <linux/string.h>
diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c
index ddc061dd150c..520a4b2eb9cc 100644
--- a/drivers/net/wireless/airo.c
+++ b/drivers/net/wireless/airo.c
@@ -37,7 +37,6 @@
37#include <linux/scatterlist.h> 37#include <linux/scatterlist.h>
38#include <linux/crypto.h> 38#include <linux/crypto.h>
39#include <asm/io.h> 39#include <asm/io.h>
40#include <asm/system.h>
41#include <asm/unaligned.h> 40#include <asm/unaligned.h>
42 41
43#include <linux/netdevice.h> 42#include <linux/netdevice.h>
diff --git a/drivers/net/wireless/airo_cs.c b/drivers/net/wireless/airo_cs.c
index c983c10e0f6a..630577dd3a7a 100644
--- a/drivers/net/wireless/airo_cs.c
+++ b/drivers/net/wireless/airo_cs.c
@@ -37,7 +37,6 @@
37#include <pcmcia/ds.h> 37#include <pcmcia/ds.h>
38 38
39#include <linux/io.h> 39#include <linux/io.h>
40#include <asm/system.h>
41 40
42#include "airo.h" 41#include "airo.h"
43 42
diff --git a/drivers/net/wireless/atmel.c b/drivers/net/wireless/atmel.c
index 3010cee7b95a..6c87a823f5a9 100644
--- a/drivers/net/wireless/atmel.c
+++ b/drivers/net/wireless/atmel.c
@@ -50,7 +50,6 @@
50#include <linux/timer.h> 50#include <linux/timer.h>
51#include <asm/byteorder.h> 51#include <asm/byteorder.h>
52#include <asm/io.h> 52#include <asm/io.h>
53#include <asm/system.h>
54#include <asm/uaccess.h> 53#include <asm/uaccess.h>
55#include <linux/module.h> 54#include <linux/module.h>
56#include <linux/netdevice.h> 55#include <linux/netdevice.h>
diff --git a/drivers/net/wireless/atmel_cs.c b/drivers/net/wireless/atmel_cs.c
index ec295c4f677d..ded03d226a71 100644
--- a/drivers/net/wireless/atmel_cs.c
+++ b/drivers/net/wireless/atmel_cs.c
@@ -48,7 +48,6 @@
48#include <pcmcia/ciscode.h> 48#include <pcmcia/ciscode.h>
49 49
50#include <asm/io.h> 50#include <asm/io.h>
51#include <asm/system.h>
52#include <linux/wireless.h> 51#include <linux/wireless.h>
53 52
54#include "atmel.h" 53#include "atmel.h"
diff --git a/drivers/net/wireless/prism54/islpci_mgt.c b/drivers/net/wireless/prism54/islpci_mgt.c
index 851fa10241e1..c5404cb59e08 100644
--- a/drivers/net/wireless/prism54/islpci_mgt.c
+++ b/drivers/net/wireless/prism54/islpci_mgt.c
@@ -24,7 +24,6 @@
24#include <linux/slab.h> 24#include <linux/slab.h>
25 25
26#include <asm/io.h> 26#include <asm/io.h>
27#include <asm/system.h>
28#include <linux/if_arp.h> 27#include <linux/if_arp.h>
29 28
30#include "prismcompat.h" 29#include "prismcompat.h"
diff --git a/drivers/net/wireless/ray_cs.c b/drivers/net/wireless/ray_cs.c
index 04fec1fa6e0b..86a738bf591c 100644
--- a/drivers/net/wireless/ray_cs.c
+++ b/drivers/net/wireless/ray_cs.c
@@ -53,7 +53,6 @@
53#include <net/iw_handler.h> 53#include <net/iw_handler.h>
54 54
55#include <asm/io.h> 55#include <asm/io.h>
56#include <asm/system.h>
57#include <asm/byteorder.h> 56#include <asm/byteorder.h>
58#include <asm/uaccess.h> 57#include <asm/uaccess.h>
59 58
diff --git a/drivers/net/wireless/wl3501_cs.c b/drivers/net/wireless/wl3501_cs.c
index 98fbf54f6004..00f6e69c1dcd 100644
--- a/drivers/net/wireless/wl3501_cs.c
+++ b/drivers/net/wireless/wl3501_cs.c
@@ -53,7 +53,6 @@
53 53
54#include <asm/io.h> 54#include <asm/io.h>
55#include <asm/uaccess.h> 55#include <asm/uaccess.h>
56#include <asm/system.h>
57 56
58#include "wl3501.h" 57#include "wl3501.h"
59 58