diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-02-02 13:56:33 -0500 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-02-02 13:56:33 -0500 |
commit | 78829dd9224b62e2092a681afaee1bda4d0cb93b (patch) | |
tree | 0b8fc5cb873189fb6f40a55289b542104c9868ff /drivers | |
parent | bfa14b42a3bd671f0287b3db42e703e86ef27b48 (diff) |
ide: remove needless includes from PCI host drivers
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers')
32 files changed, 4 insertions, 134 deletions
diff --git a/drivers/ide/pci/aec62xx.c b/drivers/ide/pci/aec62xx.c index ca302fcba3ab..cfb3265bc1a8 100644 --- a/drivers/ide/pci/aec62xx.c +++ b/drivers/ide/pci/aec62xx.c | |||
@@ -7,7 +7,6 @@ | |||
7 | #include <linux/module.h> | 7 | #include <linux/module.h> |
8 | #include <linux/types.h> | 8 | #include <linux/types.h> |
9 | #include <linux/pci.h> | 9 | #include <linux/pci.h> |
10 | #include <linux/delay.h> | ||
11 | #include <linux/hdreg.h> | 10 | #include <linux/hdreg.h> |
12 | #include <linux/ide.h> | 11 | #include <linux/ide.h> |
13 | #include <linux/init.h> | 12 | #include <linux/init.h> |
diff --git a/drivers/ide/pci/alim15x3.c b/drivers/ide/pci/alim15x3.c index 91db990ab756..b3b6f514ce2d 100644 --- a/drivers/ide/pci/alim15x3.c +++ b/drivers/ide/pci/alim15x3.c | |||
@@ -31,7 +31,6 @@ | |||
31 | #include <linux/types.h> | 31 | #include <linux/types.h> |
32 | #include <linux/kernel.h> | 32 | #include <linux/kernel.h> |
33 | #include <linux/pci.h> | 33 | #include <linux/pci.h> |
34 | #include <linux/delay.h> | ||
35 | #include <linux/hdreg.h> | 34 | #include <linux/hdreg.h> |
36 | #include <linux/ide.h> | 35 | #include <linux/ide.h> |
37 | #include <linux/init.h> | 36 | #include <linux/init.h> |
diff --git a/drivers/ide/pci/amd74xx.c b/drivers/ide/pci/amd74xx.c index d6d58d217142..2ef890ce8097 100644 --- a/drivers/ide/pci/amd74xx.c +++ b/drivers/ide/pci/amd74xx.c | |||
@@ -17,12 +17,9 @@ | |||
17 | 17 | ||
18 | #include <linux/module.h> | 18 | #include <linux/module.h> |
19 | #include <linux/kernel.h> | 19 | #include <linux/kernel.h> |
20 | #include <linux/ioport.h> | ||
21 | #include <linux/blkdev.h> | ||
22 | #include <linux/pci.h> | 20 | #include <linux/pci.h> |
23 | #include <linux/init.h> | 21 | #include <linux/init.h> |
24 | #include <linux/ide.h> | 22 | #include <linux/ide.h> |
25 | #include <asm/io.h> | ||
26 | 23 | ||
27 | #include "ide-timing.h" | 24 | #include "ide-timing.h" |
28 | 25 | ||
diff --git a/drivers/ide/pci/atiixp.c b/drivers/ide/pci/atiixp.c index b84185b4b68f..7e037c880cb0 100644 --- a/drivers/ide/pci/atiixp.c +++ b/drivers/ide/pci/atiixp.c | |||
@@ -6,15 +6,11 @@ | |||
6 | #include <linux/types.h> | 6 | #include <linux/types.h> |
7 | #include <linux/module.h> | 7 | #include <linux/module.h> |
8 | #include <linux/kernel.h> | 8 | #include <linux/kernel.h> |
9 | #include <linux/ioport.h> | ||
10 | #include <linux/pci.h> | 9 | #include <linux/pci.h> |
11 | #include <linux/hdreg.h> | 10 | #include <linux/hdreg.h> |
12 | #include <linux/ide.h> | 11 | #include <linux/ide.h> |
13 | #include <linux/delay.h> | ||
14 | #include <linux/init.h> | 12 | #include <linux/init.h> |
15 | 13 | ||
16 | #include <asm/io.h> | ||
17 | |||
18 | #define ATIIXP_IDE_PIO_TIMING 0x40 | 14 | #define ATIIXP_IDE_PIO_TIMING 0x40 |
19 | #define ATIIXP_IDE_MDMA_TIMING 0x44 | 15 | #define ATIIXP_IDE_MDMA_TIMING 0x44 |
20 | #define ATIIXP_IDE_PIO_CONTROL 0x48 | 16 | #define ATIIXP_IDE_PIO_CONTROL 0x48 |
diff --git a/drivers/ide/pci/cmd640.c b/drivers/ide/pci/cmd640.c index ea0cb500df6a..bd24dad3cfc6 100644 --- a/drivers/ide/pci/cmd640.c +++ b/drivers/ide/pci/cmd640.c | |||
@@ -103,10 +103,6 @@ | |||
103 | #include <linux/types.h> | 103 | #include <linux/types.h> |
104 | #include <linux/kernel.h> | 104 | #include <linux/kernel.h> |
105 | #include <linux/delay.h> | 105 | #include <linux/delay.h> |
106 | #include <linux/timer.h> | ||
107 | #include <linux/mm.h> | ||
108 | #include <linux/ioport.h> | ||
109 | #include <linux/blkdev.h> | ||
110 | #include <linux/hdreg.h> | 106 | #include <linux/hdreg.h> |
111 | #include <linux/ide.h> | 107 | #include <linux/ide.h> |
112 | #include <linux/init.h> | 108 | #include <linux/init.h> |
diff --git a/drivers/ide/pci/cmd64x.c b/drivers/ide/pci/cmd64x.c index 181506340d98..edabe6299efd 100644 --- a/drivers/ide/pci/cmd64x.c +++ b/drivers/ide/pci/cmd64x.c | |||
@@ -13,7 +13,6 @@ | |||
13 | #include <linux/module.h> | 13 | #include <linux/module.h> |
14 | #include <linux/types.h> | 14 | #include <linux/types.h> |
15 | #include <linux/pci.h> | 15 | #include <linux/pci.h> |
16 | #include <linux/delay.h> | ||
17 | #include <linux/hdreg.h> | 16 | #include <linux/hdreg.h> |
18 | #include <linux/ide.h> | 17 | #include <linux/ide.h> |
19 | #include <linux/init.h> | 18 | #include <linux/init.h> |
diff --git a/drivers/ide/pci/cs5520.c b/drivers/ide/pci/cs5520.c index 793528666672..0be1a824102b 100644 --- a/drivers/ide/pci/cs5520.c +++ b/drivers/ide/pci/cs5520.c | |||
@@ -35,22 +35,12 @@ | |||
35 | #include <linux/module.h> | 35 | #include <linux/module.h> |
36 | #include <linux/types.h> | 36 | #include <linux/types.h> |
37 | #include <linux/kernel.h> | 37 | #include <linux/kernel.h> |
38 | #include <linux/delay.h> | ||
39 | #include <linux/timer.h> | ||
40 | #include <linux/mm.h> | ||
41 | #include <linux/ioport.h> | ||
42 | #include <linux/blkdev.h> | ||
43 | #include <linux/hdreg.h> | 38 | #include <linux/hdreg.h> |
44 | |||
45 | #include <linux/interrupt.h> | ||
46 | #include <linux/init.h> | 39 | #include <linux/init.h> |
47 | #include <linux/pci.h> | 40 | #include <linux/pci.h> |
48 | #include <linux/ide.h> | 41 | #include <linux/ide.h> |
49 | #include <linux/dma-mapping.h> | 42 | #include <linux/dma-mapping.h> |
50 | 43 | ||
51 | #include <asm/io.h> | ||
52 | #include <asm/irq.h> | ||
53 | |||
54 | struct pio_clocks | 44 | struct pio_clocks |
55 | { | 45 | { |
56 | int address; | 46 | int address; |
diff --git a/drivers/ide/pci/cs5530.c b/drivers/ide/pci/cs5530.c index 765aac397ced..941a1344820b 100644 --- a/drivers/ide/pci/cs5530.c +++ b/drivers/ide/pci/cs5530.c | |||
@@ -15,18 +15,12 @@ | |||
15 | #include <linux/module.h> | 15 | #include <linux/module.h> |
16 | #include <linux/types.h> | 16 | #include <linux/types.h> |
17 | #include <linux/kernel.h> | 17 | #include <linux/kernel.h> |
18 | #include <linux/delay.h> | ||
19 | #include <linux/timer.h> | ||
20 | #include <linux/mm.h> | ||
21 | #include <linux/ioport.h> | ||
22 | #include <linux/blkdev.h> | ||
23 | #include <linux/hdreg.h> | 18 | #include <linux/hdreg.h> |
24 | #include <linux/interrupt.h> | ||
25 | #include <linux/pci.h> | 19 | #include <linux/pci.h> |
26 | #include <linux/init.h> | 20 | #include <linux/init.h> |
27 | #include <linux/ide.h> | 21 | #include <linux/ide.h> |
22 | |||
28 | #include <asm/io.h> | 23 | #include <asm/io.h> |
29 | #include <asm/irq.h> | ||
30 | 24 | ||
31 | /* | 25 | /* |
32 | * Here are the standard PIO mode 0-4 timings for each "format". | 26 | * Here are the standard PIO mode 0-4 timings for each "format". |
diff --git a/drivers/ide/pci/cy82c693.c b/drivers/ide/pci/cy82c693.c index 50100ac8770f..724cbacf4e5b 100644 --- a/drivers/ide/pci/cy82c693.c +++ b/drivers/ide/pci/cy82c693.c | |||
@@ -45,7 +45,6 @@ | |||
45 | #include <linux/module.h> | 45 | #include <linux/module.h> |
46 | #include <linux/types.h> | 46 | #include <linux/types.h> |
47 | #include <linux/pci.h> | 47 | #include <linux/pci.h> |
48 | #include <linux/delay.h> | ||
49 | #include <linux/ide.h> | 48 | #include <linux/ide.h> |
50 | #include <linux/init.h> | 49 | #include <linux/init.h> |
51 | 50 | ||
diff --git a/drivers/ide/pci/delkin_cb.c b/drivers/ide/pci/delkin_cb.c index 27e47fc97100..3fdf5e5a6fbe 100644 --- a/drivers/ide/pci/delkin_cb.c +++ b/drivers/ide/pci/delkin_cb.c | |||
@@ -16,15 +16,14 @@ | |||
16 | * License. See the file COPYING in the main directory of this archive for | 16 | * License. See the file COPYING in the main directory of this archive for |
17 | * more details. | 17 | * more details. |
18 | */ | 18 | */ |
19 | #include <linux/autoconf.h> | 19 | |
20 | #include <linux/types.h> | 20 | #include <linux/types.h> |
21 | #include <linux/module.h> | 21 | #include <linux/module.h> |
22 | #include <linux/mm.h> | ||
23 | #include <linux/blkdev.h> | ||
24 | #include <linux/hdreg.h> | 22 | #include <linux/hdreg.h> |
25 | #include <linux/ide.h> | 23 | #include <linux/ide.h> |
26 | #include <linux/init.h> | 24 | #include <linux/init.h> |
27 | #include <linux/pci.h> | 25 | #include <linux/pci.h> |
26 | |||
28 | #include <asm/io.h> | 27 | #include <asm/io.h> |
29 | 28 | ||
30 | /* | 29 | /* |
diff --git a/drivers/ide/pci/generic.c b/drivers/ide/pci/generic.c index 59ebe84f1053..9262a9174b4e 100644 --- a/drivers/ide/pci/generic.c +++ b/drivers/ide/pci/generic.c | |||
@@ -22,18 +22,11 @@ | |||
22 | #include <linux/types.h> | 22 | #include <linux/types.h> |
23 | #include <linux/module.h> | 23 | #include <linux/module.h> |
24 | #include <linux/kernel.h> | 24 | #include <linux/kernel.h> |
25 | #include <linux/delay.h> | ||
26 | #include <linux/timer.h> | ||
27 | #include <linux/mm.h> | ||
28 | #include <linux/ioport.h> | ||
29 | #include <linux/blkdev.h> | ||
30 | #include <linux/hdreg.h> | 25 | #include <linux/hdreg.h> |
31 | #include <linux/pci.h> | 26 | #include <linux/pci.h> |
32 | #include <linux/ide.h> | 27 | #include <linux/ide.h> |
33 | #include <linux/init.h> | 28 | #include <linux/init.h> |
34 | 29 | ||
35 | #include <asm/io.h> | ||
36 | |||
37 | static int ide_generic_all; /* Set to claim all devices */ | 30 | static int ide_generic_all; /* Set to claim all devices */ |
38 | 31 | ||
39 | /* | 32 | /* |
diff --git a/drivers/ide/pci/hpt34x.c b/drivers/ide/pci/hpt34x.c index 25dbb814822d..9f01da46b016 100644 --- a/drivers/ide/pci/hpt34x.c +++ b/drivers/ide/pci/hpt34x.c | |||
@@ -26,20 +26,13 @@ | |||
26 | #include <linux/module.h> | 26 | #include <linux/module.h> |
27 | #include <linux/types.h> | 27 | #include <linux/types.h> |
28 | #include <linux/kernel.h> | 28 | #include <linux/kernel.h> |
29 | #include <linux/delay.h> | ||
30 | #include <linux/timer.h> | ||
31 | #include <linux/mm.h> | ||
32 | #include <linux/ioport.h> | 29 | #include <linux/ioport.h> |
33 | #include <linux/blkdev.h> | ||
34 | #include <linux/hdreg.h> | 30 | #include <linux/hdreg.h> |
35 | #include <linux/interrupt.h> | 31 | #include <linux/interrupt.h> |
36 | #include <linux/pci.h> | 32 | #include <linux/pci.h> |
37 | #include <linux/init.h> | 33 | #include <linux/init.h> |
38 | #include <linux/ide.h> | 34 | #include <linux/ide.h> |
39 | 35 | ||
40 | #include <asm/io.h> | ||
41 | #include <asm/irq.h> | ||
42 | |||
43 | #define HPT343_DEBUG_DRIVE_INFO 0 | 36 | #define HPT343_DEBUG_DRIVE_INFO 0 |
44 | 37 | ||
45 | static void hpt34x_set_mode(ide_drive_t *drive, const u8 speed) | 38 | static void hpt34x_set_mode(ide_drive_t *drive, const u8 speed) |
diff --git a/drivers/ide/pci/hpt366.c b/drivers/ide/pci/hpt366.c index 7a8c8c7a8b96..d0f7bb8b8adf 100644 --- a/drivers/ide/pci/hpt366.c +++ b/drivers/ide/pci/hpt366.c | |||
@@ -121,12 +121,8 @@ | |||
121 | #include <linux/module.h> | 121 | #include <linux/module.h> |
122 | #include <linux/kernel.h> | 122 | #include <linux/kernel.h> |
123 | #include <linux/delay.h> | 123 | #include <linux/delay.h> |
124 | #include <linux/timer.h> | ||
125 | #include <linux/mm.h> | ||
126 | #include <linux/ioport.h> | ||
127 | #include <linux/blkdev.h> | 124 | #include <linux/blkdev.h> |
128 | #include <linux/hdreg.h> | 125 | #include <linux/hdreg.h> |
129 | |||
130 | #include <linux/interrupt.h> | 126 | #include <linux/interrupt.h> |
131 | #include <linux/pci.h> | 127 | #include <linux/pci.h> |
132 | #include <linux/init.h> | 128 | #include <linux/init.h> |
@@ -134,7 +130,6 @@ | |||
134 | 130 | ||
135 | #include <asm/uaccess.h> | 131 | #include <asm/uaccess.h> |
136 | #include <asm/io.h> | 132 | #include <asm/io.h> |
137 | #include <asm/irq.h> | ||
138 | 133 | ||
139 | /* various tuning parameters */ | 134 | /* various tuning parameters */ |
140 | #define HPT_RESET_STATE_ENGINE | 135 | #define HPT_RESET_STATE_ENGINE |
diff --git a/drivers/ide/pci/it8213.c b/drivers/ide/pci/it8213.c index c781ea6502d6..e3427eaab430 100644 --- a/drivers/ide/pci/it8213.c +++ b/drivers/ide/pci/it8213.c | |||
@@ -10,13 +10,10 @@ | |||
10 | #include <linux/types.h> | 10 | #include <linux/types.h> |
11 | #include <linux/module.h> | 11 | #include <linux/module.h> |
12 | #include <linux/pci.h> | 12 | #include <linux/pci.h> |
13 | #include <linux/delay.h> | ||
14 | #include <linux/hdreg.h> | 13 | #include <linux/hdreg.h> |
15 | #include <linux/ide.h> | 14 | #include <linux/ide.h> |
16 | #include <linux/init.h> | 15 | #include <linux/init.h> |
17 | 16 | ||
18 | #include <asm/io.h> | ||
19 | |||
20 | /** | 17 | /** |
21 | * it8213_set_pio_mode - set host controller for PIO mode | 18 | * it8213_set_pio_mode - set host controller for PIO mode |
22 | * @drive: drive | 19 | * @drive: drive |
diff --git a/drivers/ide/pci/it821x.c b/drivers/ide/pci/it821x.c index 79232c6c1f01..1597f0cc1bf1 100644 --- a/drivers/ide/pci/it821x.c +++ b/drivers/ide/pci/it821x.c | |||
@@ -63,13 +63,10 @@ | |||
63 | #include <linux/types.h> | 63 | #include <linux/types.h> |
64 | #include <linux/module.h> | 64 | #include <linux/module.h> |
65 | #include <linux/pci.h> | 65 | #include <linux/pci.h> |
66 | #include <linux/delay.h> | ||
67 | #include <linux/hdreg.h> | 66 | #include <linux/hdreg.h> |
68 | #include <linux/ide.h> | 67 | #include <linux/ide.h> |
69 | #include <linux/init.h> | 68 | #include <linux/init.h> |
70 | 69 | ||
71 | #include <asm/io.h> | ||
72 | |||
73 | struct it821x_dev | 70 | struct it821x_dev |
74 | { | 71 | { |
75 | unsigned int smart:1, /* Are we in smart raid mode */ | 72 | unsigned int smart:1, /* Are we in smart raid mode */ |
diff --git a/drivers/ide/pci/jmicron.c b/drivers/ide/pci/jmicron.c index ff53c2df7a13..a56bcb4f22f4 100644 --- a/drivers/ide/pci/jmicron.c +++ b/drivers/ide/pci/jmicron.c | |||
@@ -8,13 +8,10 @@ | |||
8 | #include <linux/types.h> | 8 | #include <linux/types.h> |
9 | #include <linux/module.h> | 9 | #include <linux/module.h> |
10 | #include <linux/pci.h> | 10 | #include <linux/pci.h> |
11 | #include <linux/delay.h> | ||
12 | #include <linux/hdreg.h> | 11 | #include <linux/hdreg.h> |
13 | #include <linux/ide.h> | 12 | #include <linux/ide.h> |
14 | #include <linux/init.h> | 13 | #include <linux/init.h> |
15 | 14 | ||
16 | #include <asm/io.h> | ||
17 | |||
18 | typedef enum { | 15 | typedef enum { |
19 | PORT_PATA0 = 0, | 16 | PORT_PATA0 = 0, |
20 | PORT_PATA1 = 1, | 17 | PORT_PATA1 = 1, |
diff --git a/drivers/ide/pci/ns87415.c b/drivers/ide/pci/ns87415.c index fc9eee9ccac3..bf0d3b2931f1 100644 --- a/drivers/ide/pci/ns87415.c +++ b/drivers/ide/pci/ns87415.c | |||
@@ -10,11 +10,7 @@ | |||
10 | #include <linux/module.h> | 10 | #include <linux/module.h> |
11 | #include <linux/types.h> | 11 | #include <linux/types.h> |
12 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
13 | #include <linux/timer.h> | ||
14 | #include <linux/mm.h> | ||
15 | #include <linux/ioport.h> | ||
16 | #include <linux/interrupt.h> | 13 | #include <linux/interrupt.h> |
17 | #include <linux/blkdev.h> | ||
18 | #include <linux/hdreg.h> | 14 | #include <linux/hdreg.h> |
19 | #include <linux/pci.h> | 15 | #include <linux/pci.h> |
20 | #include <linux/delay.h> | 16 | #include <linux/delay.h> |
diff --git a/drivers/ide/pci/opti621.c b/drivers/ide/pci/opti621.c index 0ce92d323036..1e532c9a97f7 100644 --- a/drivers/ide/pci/opti621.c +++ b/drivers/ide/pci/opti621.c | |||
@@ -87,11 +87,6 @@ | |||
87 | #include <linux/types.h> | 87 | #include <linux/types.h> |
88 | #include <linux/module.h> | 88 | #include <linux/module.h> |
89 | #include <linux/kernel.h> | 89 | #include <linux/kernel.h> |
90 | #include <linux/delay.h> | ||
91 | #include <linux/timer.h> | ||
92 | #include <linux/mm.h> | ||
93 | #include <linux/ioport.h> | ||
94 | #include <linux/blkdev.h> | ||
95 | #include <linux/pci.h> | 90 | #include <linux/pci.h> |
96 | #include <linux/hdreg.h> | 91 | #include <linux/hdreg.h> |
97 | #include <linux/ide.h> | 92 | #include <linux/ide.h> |
diff --git a/drivers/ide/pci/pdc202xx_new.c b/drivers/ide/pci/pdc202xx_new.c index b552960dc1c1..1c8cb7797a4a 100644 --- a/drivers/ide/pci/pdc202xx_new.c +++ b/drivers/ide/pci/pdc202xx_new.c | |||
@@ -19,18 +19,12 @@ | |||
19 | #include <linux/types.h> | 19 | #include <linux/types.h> |
20 | #include <linux/kernel.h> | 20 | #include <linux/kernel.h> |
21 | #include <linux/delay.h> | 21 | #include <linux/delay.h> |
22 | #include <linux/timer.h> | ||
23 | #include <linux/mm.h> | ||
24 | #include <linux/ioport.h> | ||
25 | #include <linux/blkdev.h> | ||
26 | #include <linux/hdreg.h> | 22 | #include <linux/hdreg.h> |
27 | #include <linux/interrupt.h> | ||
28 | #include <linux/pci.h> | 23 | #include <linux/pci.h> |
29 | #include <linux/init.h> | 24 | #include <linux/init.h> |
30 | #include <linux/ide.h> | 25 | #include <linux/ide.h> |
31 | 26 | ||
32 | #include <asm/io.h> | 27 | #include <asm/io.h> |
33 | #include <asm/irq.h> | ||
34 | 28 | ||
35 | #ifdef CONFIG_PPC_PMAC | 29 | #ifdef CONFIG_PPC_PMAC |
36 | #include <asm/prom.h> | 30 | #include <asm/prom.h> |
diff --git a/drivers/ide/pci/pdc202xx_old.c b/drivers/ide/pci/pdc202xx_old.c index 41853a1bc913..9ee72c99d080 100644 --- a/drivers/ide/pci/pdc202xx_old.c +++ b/drivers/ide/pci/pdc202xx_old.c | |||
@@ -32,18 +32,13 @@ | |||
32 | #include <linux/module.h> | 32 | #include <linux/module.h> |
33 | #include <linux/kernel.h> | 33 | #include <linux/kernel.h> |
34 | #include <linux/delay.h> | 34 | #include <linux/delay.h> |
35 | #include <linux/timer.h> | ||
36 | #include <linux/mm.h> | ||
37 | #include <linux/ioport.h> | ||
38 | #include <linux/blkdev.h> | 35 | #include <linux/blkdev.h> |
39 | #include <linux/hdreg.h> | 36 | #include <linux/hdreg.h> |
40 | #include <linux/interrupt.h> | ||
41 | #include <linux/pci.h> | 37 | #include <linux/pci.h> |
42 | #include <linux/init.h> | 38 | #include <linux/init.h> |
43 | #include <linux/ide.h> | 39 | #include <linux/ide.h> |
44 | 40 | ||
45 | #include <asm/io.h> | 41 | #include <asm/io.h> |
46 | #include <asm/irq.h> | ||
47 | 42 | ||
48 | #define PDC202XX_DEBUG_DRIVE_INFO 0 | 43 | #define PDC202XX_DEBUG_DRIVE_INFO 0 |
49 | 44 | ||
diff --git a/drivers/ide/pci/piix.c b/drivers/ide/pci/piix.c index 039f442c9ea7..decef0f47674 100644 --- a/drivers/ide/pci/piix.c +++ b/drivers/ide/pci/piix.c | |||
@@ -47,11 +47,9 @@ | |||
47 | #include <linux/types.h> | 47 | #include <linux/types.h> |
48 | #include <linux/module.h> | 48 | #include <linux/module.h> |
49 | #include <linux/kernel.h> | 49 | #include <linux/kernel.h> |
50 | #include <linux/ioport.h> | ||
51 | #include <linux/pci.h> | 50 | #include <linux/pci.h> |
52 | #include <linux/hdreg.h> | 51 | #include <linux/hdreg.h> |
53 | #include <linux/ide.h> | 52 | #include <linux/ide.h> |
54 | #include <linux/delay.h> | ||
55 | #include <linux/init.h> | 53 | #include <linux/init.h> |
56 | 54 | ||
57 | #include <asm/io.h> | 55 | #include <asm/io.h> |
diff --git a/drivers/ide/pci/rz1000.c b/drivers/ide/pci/rz1000.c index 7ed6625819d4..dd0d18ba0022 100644 --- a/drivers/ide/pci/rz1000.c +++ b/drivers/ide/pci/rz1000.c | |||
@@ -16,18 +16,11 @@ | |||
16 | #include <linux/types.h> | 16 | #include <linux/types.h> |
17 | #include <linux/module.h> | 17 | #include <linux/module.h> |
18 | #include <linux/kernel.h> | 18 | #include <linux/kernel.h> |
19 | #include <linux/delay.h> | ||
20 | #include <linux/timer.h> | ||
21 | #include <linux/mm.h> | ||
22 | #include <linux/ioport.h> | ||
23 | #include <linux/blkdev.h> | ||
24 | #include <linux/hdreg.h> | 19 | #include <linux/hdreg.h> |
25 | #include <linux/pci.h> | 20 | #include <linux/pci.h> |
26 | #include <linux/ide.h> | 21 | #include <linux/ide.h> |
27 | #include <linux/init.h> | 22 | #include <linux/init.h> |
28 | 23 | ||
29 | #include <asm/io.h> | ||
30 | |||
31 | static void __devinit init_hwif_rz1000 (ide_hwif_t *hwif) | 24 | static void __devinit init_hwif_rz1000 (ide_hwif_t *hwif) |
32 | { | 25 | { |
33 | struct pci_dev *dev = to_pci_dev(hwif->dev); | 26 | struct pci_dev *dev = to_pci_dev(hwif->dev); |
diff --git a/drivers/ide/pci/sc1200.c b/drivers/ide/pci/sc1200.c index af499a60eb31..561aa47c7720 100644 --- a/drivers/ide/pci/sc1200.c +++ b/drivers/ide/pci/sc1200.c | |||
@@ -14,19 +14,13 @@ | |||
14 | #include <linux/module.h> | 14 | #include <linux/module.h> |
15 | #include <linux/types.h> | 15 | #include <linux/types.h> |
16 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
17 | #include <linux/delay.h> | ||
18 | #include <linux/timer.h> | ||
19 | #include <linux/mm.h> | ||
20 | #include <linux/ioport.h> | ||
21 | #include <linux/blkdev.h> | ||
22 | #include <linux/hdreg.h> | 17 | #include <linux/hdreg.h> |
23 | #include <linux/interrupt.h> | ||
24 | #include <linux/pci.h> | 18 | #include <linux/pci.h> |
25 | #include <linux/init.h> | 19 | #include <linux/init.h> |
26 | #include <linux/ide.h> | 20 | #include <linux/ide.h> |
27 | #include <linux/pm.h> | 21 | #include <linux/pm.h> |
22 | |||
28 | #include <asm/io.h> | 23 | #include <asm/io.h> |
29 | #include <asm/irq.h> | ||
30 | 24 | ||
31 | #define SC1200_REV_A 0x00 | 25 | #define SC1200_REV_A 0x00 |
32 | #define SC1200_REV_B1 0x01 | 26 | #define SC1200_REV_B1 0x01 |
diff --git a/drivers/ide/pci/serverworks.c b/drivers/ide/pci/serverworks.c index d9687a431c5a..c11880b0709f 100644 --- a/drivers/ide/pci/serverworks.c +++ b/drivers/ide/pci/serverworks.c | |||
@@ -31,12 +31,10 @@ | |||
31 | #include <linux/types.h> | 31 | #include <linux/types.h> |
32 | #include <linux/module.h> | 32 | #include <linux/module.h> |
33 | #include <linux/kernel.h> | 33 | #include <linux/kernel.h> |
34 | #include <linux/ioport.h> | ||
35 | #include <linux/pci.h> | 34 | #include <linux/pci.h> |
36 | #include <linux/hdreg.h> | 35 | #include <linux/hdreg.h> |
37 | #include <linux/ide.h> | 36 | #include <linux/ide.h> |
38 | #include <linux/init.h> | 37 | #include <linux/init.h> |
39 | #include <linux/delay.h> | ||
40 | 38 | ||
41 | #include <asm/io.h> | 39 | #include <asm/io.h> |
42 | 40 | ||
diff --git a/drivers/ide/pci/sgiioc4.c b/drivers/ide/pci/sgiioc4.c index 651845bf1ae5..054626497be4 100644 --- a/drivers/ide/pci/sgiioc4.c +++ b/drivers/ide/pci/sgiioc4.c | |||
@@ -25,8 +25,6 @@ | |||
25 | #include <linux/hdreg.h> | 25 | #include <linux/hdreg.h> |
26 | #include <linux/init.h> | 26 | #include <linux/init.h> |
27 | #include <linux/kernel.h> | 27 | #include <linux/kernel.h> |
28 | #include <linux/timer.h> | ||
29 | #include <linux/mm.h> | ||
30 | #include <linux/ioport.h> | 28 | #include <linux/ioport.h> |
31 | #include <linux/blkdev.h> | 29 | #include <linux/blkdev.h> |
32 | #include <linux/scatterlist.h> | 30 | #include <linux/scatterlist.h> |
diff --git a/drivers/ide/pci/siimage.c b/drivers/ide/pci/siimage.c index accac8342e17..5c1bd7928c27 100644 --- a/drivers/ide/pci/siimage.c +++ b/drivers/ide/pci/siimage.c | |||
@@ -39,7 +39,6 @@ | |||
39 | #include <linux/types.h> | 39 | #include <linux/types.h> |
40 | #include <linux/module.h> | 40 | #include <linux/module.h> |
41 | #include <linux/pci.h> | 41 | #include <linux/pci.h> |
42 | #include <linux/delay.h> | ||
43 | #include <linux/hdreg.h> | 42 | #include <linux/hdreg.h> |
44 | #include <linux/ide.h> | 43 | #include <linux/ide.h> |
45 | #include <linux/init.h> | 44 | #include <linux/init.h> |
diff --git a/drivers/ide/pci/sis5513.c b/drivers/ide/pci/sis5513.c index cb5c6fc6f3f9..512bb4c1fd5c 100644 --- a/drivers/ide/pci/sis5513.c +++ b/drivers/ide/pci/sis5513.c | |||
@@ -47,20 +47,11 @@ | |||
47 | #include <linux/types.h> | 47 | #include <linux/types.h> |
48 | #include <linux/module.h> | 48 | #include <linux/module.h> |
49 | #include <linux/kernel.h> | 49 | #include <linux/kernel.h> |
50 | #include <linux/delay.h> | ||
51 | #include <linux/timer.h> | ||
52 | #include <linux/mm.h> | ||
53 | #include <linux/ioport.h> | ||
54 | #include <linux/blkdev.h> | ||
55 | #include <linux/hdreg.h> | 50 | #include <linux/hdreg.h> |
56 | |||
57 | #include <linux/interrupt.h> | ||
58 | #include <linux/pci.h> | 51 | #include <linux/pci.h> |
59 | #include <linux/init.h> | 52 | #include <linux/init.h> |
60 | #include <linux/ide.h> | 53 | #include <linux/ide.h> |
61 | 54 | ||
62 | #include <asm/irq.h> | ||
63 | |||
64 | #include "ide-timing.h" | 55 | #include "ide-timing.h" |
65 | 56 | ||
66 | /* registers layout and init values are chipset family dependant */ | 57 | /* registers layout and init values are chipset family dependant */ |
diff --git a/drivers/ide/pci/sl82c105.c b/drivers/ide/pci/sl82c105.c index da13a1298ada..ee261ae15b6f 100644 --- a/drivers/ide/pci/sl82c105.c +++ b/drivers/ide/pci/sl82c105.c | |||
@@ -17,17 +17,11 @@ | |||
17 | #include <linux/types.h> | 17 | #include <linux/types.h> |
18 | #include <linux/module.h> | 18 | #include <linux/module.h> |
19 | #include <linux/kernel.h> | 19 | #include <linux/kernel.h> |
20 | #include <linux/timer.h> | ||
21 | #include <linux/mm.h> | ||
22 | #include <linux/ioport.h> | ||
23 | #include <linux/interrupt.h> | ||
24 | #include <linux/blkdev.h> | ||
25 | #include <linux/hdreg.h> | 20 | #include <linux/hdreg.h> |
26 | #include <linux/pci.h> | 21 | #include <linux/pci.h> |
27 | #include <linux/ide.h> | 22 | #include <linux/ide.h> |
28 | 23 | ||
29 | #include <asm/io.h> | 24 | #include <asm/io.h> |
30 | #include <asm/dma.h> | ||
31 | 25 | ||
32 | #undef DEBUG | 26 | #undef DEBUG |
33 | 27 | ||
diff --git a/drivers/ide/pci/slc90e66.c b/drivers/ide/pci/slc90e66.c index 427f95b25fde..65f4c2ffaa59 100644 --- a/drivers/ide/pci/slc90e66.c +++ b/drivers/ide/pci/slc90e66.c | |||
@@ -10,15 +10,11 @@ | |||
10 | #include <linux/types.h> | 10 | #include <linux/types.h> |
11 | #include <linux/module.h> | 11 | #include <linux/module.h> |
12 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
13 | #include <linux/ioport.h> | ||
14 | #include <linux/pci.h> | 13 | #include <linux/pci.h> |
15 | #include <linux/hdreg.h> | 14 | #include <linux/hdreg.h> |
16 | #include <linux/ide.h> | 15 | #include <linux/ide.h> |
17 | #include <linux/delay.h> | ||
18 | #include <linux/init.h> | 16 | #include <linux/init.h> |
19 | 17 | ||
20 | #include <asm/io.h> | ||
21 | |||
22 | static DEFINE_SPINLOCK(slc90e66_lock); | 18 | static DEFINE_SPINLOCK(slc90e66_lock); |
23 | 19 | ||
24 | static void slc90e66_set_pio_mode(ide_drive_t *drive, const u8 pio) | 20 | static void slc90e66_set_pio_mode(ide_drive_t *drive, const u8 pio) |
diff --git a/drivers/ide/pci/triflex.c b/drivers/ide/pci/triflex.c index 852b72693736..a67d02a3f96e 100644 --- a/drivers/ide/pci/triflex.c +++ b/drivers/ide/pci/triflex.c | |||
@@ -28,11 +28,6 @@ | |||
28 | #include <linux/types.h> | 28 | #include <linux/types.h> |
29 | #include <linux/module.h> | 29 | #include <linux/module.h> |
30 | #include <linux/kernel.h> | 30 | #include <linux/kernel.h> |
31 | #include <linux/delay.h> | ||
32 | #include <linux/timer.h> | ||
33 | #include <linux/mm.h> | ||
34 | #include <linux/ioport.h> | ||
35 | #include <linux/blkdev.h> | ||
36 | #include <linux/hdreg.h> | 31 | #include <linux/hdreg.h> |
37 | #include <linux/pci.h> | 32 | #include <linux/pci.h> |
38 | #include <linux/ide.h> | 33 | #include <linux/ide.h> |
diff --git a/drivers/ide/pci/trm290.c b/drivers/ide/pci/trm290.c index d9ebb698953a..e3d58c9f05e0 100644 --- a/drivers/ide/pci/trm290.c +++ b/drivers/ide/pci/trm290.c | |||
@@ -131,14 +131,12 @@ | |||
131 | #include <linux/types.h> | 131 | #include <linux/types.h> |
132 | #include <linux/module.h> | 132 | #include <linux/module.h> |
133 | #include <linux/kernel.h> | 133 | #include <linux/kernel.h> |
134 | #include <linux/mm.h> | ||
135 | #include <linux/ioport.h> | 134 | #include <linux/ioport.h> |
136 | #include <linux/interrupt.h> | 135 | #include <linux/interrupt.h> |
137 | #include <linux/blkdev.h> | 136 | #include <linux/blkdev.h> |
138 | #include <linux/init.h> | 137 | #include <linux/init.h> |
139 | #include <linux/hdreg.h> | 138 | #include <linux/hdreg.h> |
140 | #include <linux/pci.h> | 139 | #include <linux/pci.h> |
141 | #include <linux/delay.h> | ||
142 | #include <linux/ide.h> | 140 | #include <linux/ide.h> |
143 | 141 | ||
144 | #include <asm/io.h> | 142 | #include <asm/io.h> |
diff --git a/drivers/ide/pci/via82cxxx.c b/drivers/ide/pci/via82cxxx.c index c58a279d6b2f..f3f79f805813 100644 --- a/drivers/ide/pci/via82cxxx.c +++ b/drivers/ide/pci/via82cxxx.c | |||
@@ -26,15 +26,11 @@ | |||
26 | 26 | ||
27 | #include <linux/module.h> | 27 | #include <linux/module.h> |
28 | #include <linux/kernel.h> | 28 | #include <linux/kernel.h> |
29 | #include <linux/ioport.h> | ||
30 | #include <linux/blkdev.h> | ||
31 | #include <linux/pci.h> | 29 | #include <linux/pci.h> |
32 | #include <linux/init.h> | 30 | #include <linux/init.h> |
33 | #include <linux/ide.h> | 31 | #include <linux/ide.h> |
34 | #include <linux/dmi.h> | 32 | #include <linux/dmi.h> |
35 | 33 | ||
36 | #include <asm/io.h> | ||
37 | |||
38 | #ifdef CONFIG_PPC_CHRP | 34 | #ifdef CONFIG_PPC_CHRP |
39 | #include <asm/processor.h> | 35 | #include <asm/processor.h> |
40 | #endif | 36 | #endif |