diff options
author | Vitaliy Ivanov <vitalivanov@gmail.com> | 2011-06-20 10:08:07 -0400 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2011-06-20 10:08:19 -0400 |
commit | e44ba033c5654dbfda53461c9b1f7dd9bd1d198f (patch) | |
tree | 92654523983a855e466a332e104c0e51550a642d /drivers/net | |
parent | 1816315b10862277a961a70ec394b6607983041d (diff) |
treewide: remove duplicate includes
Many stupid corrections of duplicated includes based on the output of
scripts/checkincludes.pl.
Signed-off-by: Vitaliy Ivanov <vitalivanov@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/can/c_can/c_can.c | 1 | ||||
-rw-r--r-- | drivers/net/can/c_can/c_can_platform.c | 1 | ||||
-rw-r--r-- | drivers/net/sungem.c | 3 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath5k/ahb.c | 1 |
4 files changed, 1 insertions, 5 deletions
diff --git a/drivers/net/can/c_can/c_can.c b/drivers/net/can/c_can/c_can.c index 7e5cc0bd913d..ff212916810b 100644 --- a/drivers/net/can/c_can/c_can.c +++ b/drivers/net/can/c_can/c_can.c | |||
@@ -34,7 +34,6 @@ | |||
34 | #include <linux/if_arp.h> | 34 | #include <linux/if_arp.h> |
35 | #include <linux/if_ether.h> | 35 | #include <linux/if_ether.h> |
36 | #include <linux/list.h> | 36 | #include <linux/list.h> |
37 | #include <linux/delay.h> | ||
38 | #include <linux/io.h> | 37 | #include <linux/io.h> |
39 | 38 | ||
40 | #include <linux/can.h> | 39 | #include <linux/can.h> |
diff --git a/drivers/net/can/c_can/c_can_platform.c b/drivers/net/can/c_can/c_can_platform.c index cc90824f2c9c..0b071564d1dc 100644 --- a/drivers/net/can/c_can/c_can_platform.c +++ b/drivers/net/can/c_can/c_can_platform.c | |||
@@ -28,7 +28,6 @@ | |||
28 | #include <linux/if_arp.h> | 28 | #include <linux/if_arp.h> |
29 | #include <linux/if_ether.h> | 29 | #include <linux/if_ether.h> |
30 | #include <linux/list.h> | 30 | #include <linux/list.h> |
31 | #include <linux/delay.h> | ||
32 | #include <linux/io.h> | 31 | #include <linux/io.h> |
33 | #include <linux/platform_device.h> | 32 | #include <linux/platform_device.h> |
34 | #include <linux/clk.h> | 33 | #include <linux/clk.h> |
diff --git a/drivers/net/sungem.c b/drivers/net/sungem.c index ab5930099267..70f018d37399 100644 --- a/drivers/net/sungem.c +++ b/drivers/net/sungem.c | |||
@@ -66,15 +66,14 @@ | |||
66 | #include <asm/byteorder.h> | 66 | #include <asm/byteorder.h> |
67 | #include <asm/uaccess.h> | 67 | #include <asm/uaccess.h> |
68 | #include <asm/irq.h> | 68 | #include <asm/irq.h> |
69 | #include <asm/prom.h> | ||
69 | 70 | ||
70 | #ifdef CONFIG_SPARC | 71 | #ifdef CONFIG_SPARC |
71 | #include <asm/idprom.h> | 72 | #include <asm/idprom.h> |
72 | #include <asm/prom.h> | ||
73 | #endif | 73 | #endif |
74 | 74 | ||
75 | #ifdef CONFIG_PPC_PMAC | 75 | #ifdef CONFIG_PPC_PMAC |
76 | #include <asm/pci-bridge.h> | 76 | #include <asm/pci-bridge.h> |
77 | #include <asm/prom.h> | ||
78 | #include <asm/machdep.h> | 77 | #include <asm/machdep.h> |
79 | #include <asm/pmac_feature.h> | 78 | #include <asm/pmac_feature.h> |
80 | #endif | 79 | #endif |
diff --git a/drivers/net/wireless/ath/ath5k/ahb.c b/drivers/net/wireless/ath/ath5k/ahb.c index ea9982781559..45dd20c0dc72 100644 --- a/drivers/net/wireless/ath/ath5k/ahb.c +++ b/drivers/net/wireless/ath/ath5k/ahb.c | |||
@@ -24,7 +24,6 @@ | |||
24 | #include "debug.h" | 24 | #include "debug.h" |
25 | #include "base.h" | 25 | #include "base.h" |
26 | #include "reg.h" | 26 | #include "reg.h" |
27 | #include "debug.h" | ||
28 | 27 | ||
29 | /* return bus cachesize in 4B word units */ | 28 | /* return bus cachesize in 4B word units */ |
30 | static void ath5k_ahb_read_cachesize(struct ath_common *common, int *csz) | 29 | static void ath5k_ahb_read_cachesize(struct ath_common *common, int *csz) |