diff options
author | Jesper Juhl <jesper.juhl@gmail.com> | 2007-08-10 17:05:20 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-10 19:50:26 -0400 |
commit | bf1e9a080d7766bd65b8d8eb837ecde8b03dcc31 (patch) | |
tree | 3081072cbfb9ff3afad4cce26f412f53565e787b | |
parent | 10096974adb6d62b9f8cf65c266632ea73040936 (diff) |
Clean up duplicate includes in drivers/net/
This patch cleans up duplicate includes in
drivers/net/
Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com>
Acked-by: "John W. Linville" <linville@tuxdriver.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
-rw-r--r-- | drivers/net/atl1/atl1_main.c | 1 | ||||
-rw-r--r-- | drivers/net/bfin_mac.c | 5 | ||||
-rw-r--r-- | drivers/net/bonding/bond_sysfs.c | 1 | ||||
-rw-r--r-- | drivers/net/fs_enet/fs_enet-main.c | 2 | ||||
-rw-r--r-- | drivers/net/gianfar.h | 1 | ||||
-rw-r--r-- | drivers/net/gianfar_ethtool.c | 1 | ||||
-rw-r--r-- | drivers/net/irda/kingsun-sir.c | 1 | ||||
-rw-r--r-- | drivers/net/irda/mcs7780.c | 1 | ||||
-rw-r--r-- | drivers/net/mipsnet.c | 1 | ||||
-rw-r--r-- | drivers/net/netxen/netxen_nic_main.c | 1 | ||||
-rwxr-xr-x | drivers/net/qla3xxx.c | 1 | ||||
-rw-r--r-- | drivers/net/tsi108_eth.c | 1 | ||||
-rw-r--r-- | drivers/net/wireless/ipw2200.h | 1 | ||||
-rw-r--r-- | drivers/net/wireless/zd1211rw/zd_def.h | 1 |
14 files changed, 0 insertions, 19 deletions
diff --git a/drivers/net/atl1/atl1_main.c b/drivers/net/atl1/atl1_main.c index f23e13c8f9a..469ff95be55 100644 --- a/drivers/net/atl1/atl1_main.c +++ b/drivers/net/atl1/atl1_main.c | |||
@@ -76,7 +76,6 @@ | |||
76 | #include <linux/compiler.h> | 76 | #include <linux/compiler.h> |
77 | #include <linux/delay.h> | 77 | #include <linux/delay.h> |
78 | #include <linux/mii.h> | 78 | #include <linux/mii.h> |
79 | #include <linux/interrupt.h> | ||
80 | #include <net/checksum.h> | 79 | #include <net/checksum.h> |
81 | 80 | ||
82 | #include <asm/atomic.h> | 81 | #include <asm/atomic.h> |
diff --git a/drivers/net/bfin_mac.c b/drivers/net/bfin_mac.c index 2bb97d46468..3354c534335 100644 --- a/drivers/net/bfin_mac.c +++ b/drivers/net/bfin_mac.c | |||
@@ -47,15 +47,10 @@ | |||
47 | #include <linux/spinlock.h> | 47 | #include <linux/spinlock.h> |
48 | #include <linux/ethtool.h> | 48 | #include <linux/ethtool.h> |
49 | #include <linux/mii.h> | 49 | #include <linux/mii.h> |
50 | |||
51 | #include <linux/netdevice.h> | 50 | #include <linux/netdevice.h> |
52 | #include <linux/etherdevice.h> | 51 | #include <linux/etherdevice.h> |
53 | #include <linux/skbuff.h> | 52 | #include <linux/skbuff.h> |
54 | |||
55 | #include <linux/platform_device.h> | 53 | #include <linux/platform_device.h> |
56 | #include <linux/netdevice.h> | ||
57 | #include <linux/etherdevice.h> | ||
58 | #include <linux/skbuff.h> | ||
59 | 54 | ||
60 | #include <asm/dma.h> | 55 | #include <asm/dma.h> |
61 | #include <linux/dma-mapping.h> | 56 | #include <linux/dma-mapping.h> |
diff --git a/drivers/net/bonding/bond_sysfs.c b/drivers/net/bonding/bond_sysfs.c index 8289e27a360..a771853219d 100644 --- a/drivers/net/bonding/bond_sysfs.c +++ b/drivers/net/bonding/bond_sysfs.c | |||
@@ -31,7 +31,6 @@ | |||
31 | #include <linux/inetdevice.h> | 31 | #include <linux/inetdevice.h> |
32 | #include <linux/in.h> | 32 | #include <linux/in.h> |
33 | #include <linux/sysfs.h> | 33 | #include <linux/sysfs.h> |
34 | #include <linux/string.h> | ||
35 | #include <linux/ctype.h> | 34 | #include <linux/ctype.h> |
36 | #include <linux/inet.h> | 35 | #include <linux/inet.h> |
37 | #include <linux/rtnetlink.h> | 36 | #include <linux/rtnetlink.h> |
diff --git a/drivers/net/fs_enet/fs_enet-main.c b/drivers/net/fs_enet/fs_enet-main.c index c509cb13222..5dc89d507e6 100644 --- a/drivers/net/fs_enet/fs_enet-main.c +++ b/drivers/net/fs_enet/fs_enet-main.c | |||
@@ -39,8 +39,6 @@ | |||
39 | 39 | ||
40 | #include <linux/vmalloc.h> | 40 | #include <linux/vmalloc.h> |
41 | #include <asm/pgtable.h> | 41 | #include <asm/pgtable.h> |
42 | |||
43 | #include <asm/pgtable.h> | ||
44 | #include <asm/irq.h> | 42 | #include <asm/irq.h> |
45 | #include <asm/uaccess.h> | 43 | #include <asm/uaccess.h> |
46 | 44 | ||
diff --git a/drivers/net/gianfar.h b/drivers/net/gianfar.h index b8714e00482..c16cc8b946a 100644 --- a/drivers/net/gianfar.h +++ b/drivers/net/gianfar.h | |||
@@ -45,7 +45,6 @@ | |||
45 | #include <linux/crc32.h> | 45 | #include <linux/crc32.h> |
46 | #include <linux/workqueue.h> | 46 | #include <linux/workqueue.h> |
47 | #include <linux/ethtool.h> | 47 | #include <linux/ethtool.h> |
48 | #include <linux/netdevice.h> | ||
49 | #include <linux/fsl_devices.h> | 48 | #include <linux/fsl_devices.h> |
50 | #include "gianfar_mii.h" | 49 | #include "gianfar_mii.h" |
51 | 50 | ||
diff --git a/drivers/net/gianfar_ethtool.c b/drivers/net/gianfar_ethtool.c index 7b411c1514d..2470903fbc7 100644 --- a/drivers/net/gianfar_ethtool.c +++ b/drivers/net/gianfar_ethtool.c | |||
@@ -34,7 +34,6 @@ | |||
34 | #include <linux/module.h> | 34 | #include <linux/module.h> |
35 | #include <linux/crc32.h> | 35 | #include <linux/crc32.h> |
36 | #include <asm/types.h> | 36 | #include <asm/types.h> |
37 | #include <asm/uaccess.h> | ||
38 | #include <linux/ethtool.h> | 37 | #include <linux/ethtool.h> |
39 | #include <linux/mii.h> | 38 | #include <linux/mii.h> |
40 | #include <linux/phy.h> | 39 | #include <linux/phy.h> |
diff --git a/drivers/net/irda/kingsun-sir.c b/drivers/net/irda/kingsun-sir.c index 4e5101a45c3..a4adb74cccd 100644 --- a/drivers/net/irda/kingsun-sir.c +++ b/drivers/net/irda/kingsun-sir.c | |||
@@ -66,7 +66,6 @@ | |||
66 | #include <linux/errno.h> | 66 | #include <linux/errno.h> |
67 | #include <linux/init.h> | 67 | #include <linux/init.h> |
68 | #include <linux/slab.h> | 68 | #include <linux/slab.h> |
69 | #include <linux/module.h> | ||
70 | #include <linux/kref.h> | 69 | #include <linux/kref.h> |
71 | #include <linux/usb.h> | 70 | #include <linux/usb.h> |
72 | #include <linux/device.h> | 71 | #include <linux/device.h> |
diff --git a/drivers/net/irda/mcs7780.c b/drivers/net/irda/mcs7780.c index 0de867288a4..bfc57525bd6 100644 --- a/drivers/net/irda/mcs7780.c +++ b/drivers/net/irda/mcs7780.c | |||
@@ -50,7 +50,6 @@ | |||
50 | #include <linux/errno.h> | 50 | #include <linux/errno.h> |
51 | #include <linux/init.h> | 51 | #include <linux/init.h> |
52 | #include <linux/slab.h> | 52 | #include <linux/slab.h> |
53 | #include <linux/module.h> | ||
54 | #include <linux/kref.h> | 53 | #include <linux/kref.h> |
55 | #include <linux/usb.h> | 54 | #include <linux/usb.h> |
56 | #include <linux/device.h> | 55 | #include <linux/device.h> |
diff --git a/drivers/net/mipsnet.c b/drivers/net/mipsnet.c index 9853c74f6bb..c0f5ad38fb1 100644 --- a/drivers/net/mipsnet.c +++ b/drivers/net/mipsnet.c | |||
@@ -11,7 +11,6 @@ | |||
11 | #include <linux/module.h> | 11 | #include <linux/module.h> |
12 | #include <linux/netdevice.h> | 12 | #include <linux/netdevice.h> |
13 | #include <linux/etherdevice.h> | 13 | #include <linux/etherdevice.h> |
14 | #include <linux/netdevice.h> | ||
15 | #include <linux/platform_device.h> | 14 | #include <linux/platform_device.h> |
16 | #include <asm/io.h> | 15 | #include <asm/io.h> |
17 | #include <asm/mips-boards/simint.h> | 16 | #include <asm/mips-boards/simint.h> |
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c index a10bbefbdad..af16553e18b 100644 --- a/drivers/net/netxen/netxen_nic_main.c +++ b/drivers/net/netxen/netxen_nic_main.c | |||
@@ -39,7 +39,6 @@ | |||
39 | #include "netxen_nic_phan_reg.h" | 39 | #include "netxen_nic_phan_reg.h" |
40 | 40 | ||
41 | #include <linux/dma-mapping.h> | 41 | #include <linux/dma-mapping.h> |
42 | #include <linux/vmalloc.h> | ||
43 | #include <net/ip.h> | 42 | #include <net/ip.h> |
44 | 43 | ||
45 | MODULE_DESCRIPTION("NetXen Multi port (1/10) Gigabit Network Driver"); | 44 | MODULE_DESCRIPTION("NetXen Multi port (1/10) Gigabit Network Driver"); |
diff --git a/drivers/net/qla3xxx.c b/drivers/net/qla3xxx.c index bf9f8f64ba6..e39232320e3 100755 --- a/drivers/net/qla3xxx.c +++ b/drivers/net/qla3xxx.c | |||
@@ -31,7 +31,6 @@ | |||
31 | #include <linux/skbuff.h> | 31 | #include <linux/skbuff.h> |
32 | #include <linux/rtnetlink.h> | 32 | #include <linux/rtnetlink.h> |
33 | #include <linux/if_vlan.h> | 33 | #include <linux/if_vlan.h> |
34 | #include <linux/init.h> | ||
35 | #include <linux/delay.h> | 34 | #include <linux/delay.h> |
36 | #include <linux/mm.h> | 35 | #include <linux/mm.h> |
37 | 36 | ||
diff --git a/drivers/net/tsi108_eth.c b/drivers/net/tsi108_eth.c index b3069ee34bd..a1d305b9b12 100644 --- a/drivers/net/tsi108_eth.c +++ b/drivers/net/tsi108_eth.c | |||
@@ -47,7 +47,6 @@ | |||
47 | #include <linux/rtnetlink.h> | 47 | #include <linux/rtnetlink.h> |
48 | #include <linux/timer.h> | 48 | #include <linux/timer.h> |
49 | #include <linux/platform_device.h> | 49 | #include <linux/platform_device.h> |
50 | #include <linux/etherdevice.h> | ||
51 | 50 | ||
52 | #include <asm/system.h> | 51 | #include <asm/system.h> |
53 | #include <asm/io.h> | 52 | #include <asm/io.h> |
diff --git a/drivers/net/wireless/ipw2200.h b/drivers/net/wireless/ipw2200.h index 626a240a87d..9c973b96bb4 100644 --- a/drivers/net/wireless/ipw2200.h +++ b/drivers/net/wireless/ipw2200.h | |||
@@ -45,7 +45,6 @@ | |||
45 | 45 | ||
46 | #include <linux/firmware.h> | 46 | #include <linux/firmware.h> |
47 | #include <linux/wireless.h> | 47 | #include <linux/wireless.h> |
48 | #include <linux/dma-mapping.h> | ||
49 | #include <linux/jiffies.h> | 48 | #include <linux/jiffies.h> |
50 | #include <asm/io.h> | 49 | #include <asm/io.h> |
51 | 50 | ||
diff --git a/drivers/net/wireless/zd1211rw/zd_def.h b/drivers/net/wireless/zd1211rw/zd_def.h index deb99d1eaa7..505b4d7dd0e 100644 --- a/drivers/net/wireless/zd1211rw/zd_def.h +++ b/drivers/net/wireless/zd1211rw/zd_def.h | |||
@@ -21,7 +21,6 @@ | |||
21 | #include <linux/kernel.h> | 21 | #include <linux/kernel.h> |
22 | #include <linux/stringify.h> | 22 | #include <linux/stringify.h> |
23 | #include <linux/device.h> | 23 | #include <linux/device.h> |
24 | #include <linux/kernel.h> | ||
25 | 24 | ||
26 | typedef u16 __nocast zd_addr_t; | 25 | typedef u16 __nocast zd_addr_t; |
27 | 26 | ||