1 diff -ur linux.orig/drivers/ide/cmd64x.c linux/drivers/ide/cmd64x.c
2 --- linux.orig/drivers/ide/cmd64x.c Sun Nov 17 16:55:16 2002
3 +++ linux/drivers/ide/cmd64x.c Sun Nov 17 16:58:56 2002
6 #include <linux/delay.h>
7 #include <linux/hdreg.h>
8 -#include <linux/ide.h>
9 #include <linux/init.h>
12 +#include <linux/ide.h>
14 #include "ide_modes.h"
16 Only in linux/drivers/ide: cmd64x.c.orig
17 Only in linux/drivers/ide: cmd64x.c~
18 diff -ur linux.orig/drivers/ide/ide-cd.c linux/drivers/ide/ide-cd.c
19 --- linux.orig/drivers/ide/ide-cd.c Sun Nov 17 16:55:16 2002
20 +++ linux/drivers/ide/ide-cd.c Sun Nov 17 16:58:56 2002
22 #include <linux/interrupt.h>
23 #include <linux/errno.h>
24 #include <linux/cdrom.h>
25 -#include <linux/ide.h>
29 #include <asm/byteorder.h>
30 #include <asm/uaccess.h>
31 #include <asm/unaligned.h>
32 +#include <linux/ide.h>
36 diff -ur linux.orig/drivers/ide/ide-disk.c linux/drivers/ide/ide-disk.c
37 --- linux.orig/drivers/ide/ide-disk.c Sun Nov 17 16:55:16 2002
38 +++ linux/drivers/ide/ide-disk.c Sun Nov 17 17:00:44 2002
40 #include <linux/genhd.h>
41 #include <linux/slab.h>
42 #include <linux/delay.h>
43 -#include <linux/ide.h>
45 #include <asm/byteorder.h>
47 #include <asm/uaccess.h>
49 +#include <linux/ide.h>
51 #ifdef CONFIG_BLK_DEV_PDC4030
52 #define IS_PDC4030_DRIVE (HWIF(drive)->chipset == ide_pdc4030)
53 Only in linux/drivers/ide: ide-disk.c.orig
54 Only in linux/drivers/ide: ide-disk.c~
55 diff -ur linux.orig/drivers/ide/ide-dma.c linux/drivers/ide/ide-dma.c
56 --- linux.orig/drivers/ide/ide-dma.c Sun Nov 17 16:55:16 2002
57 +++ linux/drivers/ide/ide-dma.c Sun Nov 17 16:58:56 2002
59 #include <linux/interrupt.h>
60 #include <linux/pci.h>
61 #include <linux/init.h>
62 -#include <linux/ide.h>
66 +#include <linux/ide.h>
68 #include <linux/kcomp.h>
70 diff -ur linux.orig/drivers/ide/ide-features.c linux/drivers/ide/ide-features.c
71 --- linux.orig/drivers/ide/ide-features.c Sun Nov 17 16:55:16 2002
72 +++ linux/drivers/ide/ide-features.c Sun Nov 17 16:58:56 2002
74 #include <linux/pci.h>
75 #include <linux/delay.h>
76 #include <linux/hdreg.h>
77 -#include <linux/ide.h>
79 #include <asm/byteorder.h>
81 #include <asm/uaccess.h>
83 #include <asm/bitops.h>
84 +#include <linux/ide.h>
87 * A Verbose noise maker for debugging on the attempted transfer rates.
88 diff -ur linux.orig/drivers/ide/ide-floppy.c linux/drivers/ide/ide-floppy.c
89 --- linux.orig/drivers/ide/ide-floppy.c Sun Nov 17 16:55:16 2002
90 +++ linux/drivers/ide/ide-floppy.c Sun Nov 17 16:58:56 2002
92 #include <linux/genhd.h>
93 #include <linux/slab.h>
94 #include <linux/cdrom.h>
95 -#include <linux/ide.h>
97 #include <asm/byteorder.h>
101 #include <asm/unaligned.h>
102 #include <asm/bitops.h>
103 +#include <linux/ide.h>
106 * The following are used to debug the driver.
107 diff -ur linux.orig/drivers/ide/ide-geometry.c linux/drivers/ide/ide-geometry.c
108 --- linux.orig/drivers/ide/ide-geometry.c Sun Nov 17 16:55:16 2002
109 +++ linux/drivers/ide/ide-geometry.c Sun Nov 17 17:00:19 2002
111 * linux/drivers/ide/ide-geometry.c
113 #include <linux/config.h>
114 -#include <linux/ide.h>
115 #include <linux/mc146818rtc.h>
117 +#include <linux/ide.h>
119 #ifdef CONFIG_BLK_DEV_IDE
121 diff -ur linux.orig/drivers/ide/ide-pci.c linux/drivers/ide/ide-pci.c
122 --- linux.orig/drivers/ide/ide-pci.c Sun Nov 17 16:55:16 2002
123 +++ linux/drivers/ide/ide-pci.c Sun Nov 17 16:58:56 2002
125 #include <linux/interrupt.h>
126 #include <linux/pci.h>
127 #include <linux/init.h>
128 -#include <linux/ide.h>
132 +#include <linux/ide.h>
136 diff -ur linux.orig/drivers/ide/ide-probe.c linux/drivers/ide/ide-probe.c
137 --- linux.orig/drivers/ide/ide-probe.c Sun Nov 17 16:55:17 2002
138 +++ linux/drivers/ide/ide-probe.c Sun Nov 17 16:58:56 2002
140 #include <linux/malloc.h>
141 #include <linux/delay.h>
142 #include <linux/mc146818rtc.h> /* CMOS defines */
143 -#include <linux/ide.h>
145 #include <asm/byteorder.h>
147 #include <asm/uaccess.h>
149 +#include <linux/ide.h>
151 static inline void do_identify (ide_drive_t *drive, byte cmd)
153 diff -ur linux.orig/drivers/ide/ide-proc.c linux/drivers/ide/ide-proc.c
154 --- linux.orig/drivers/ide/ide-proc.c Sun Nov 17 16:55:17 2002
155 +++ linux/drivers/ide/ide-proc.c Sun Nov 17 16:58:56 2002
157 #include <linux/mm.h>
158 #include <linux/pci.h>
159 #include <linux/ctype.h>
160 -#include <linux/ide.h>
163 +#include <linux/ide.h>
167 diff -ur linux.orig/drivers/ide/ide-tape.c linux/drivers/ide/ide-tape.c
168 --- linux.orig/drivers/ide/ide-tape.c Sun Nov 17 16:55:17 2002
169 +++ linux/drivers/ide/ide-tape.c Sun Nov 17 16:58:56 2002
171 #include <linux/genhd.h>
172 #include <linux/slab.h>
173 #include <linux/pci.h>
174 -#include <linux/ide.h>
176 #include <asm/byteorder.h>
180 #include <asm/unaligned.h>
181 #include <asm/bitops.h>
182 +#include <linux/ide.h>
185 #define NO_LONGER_REQUIRED (1)
186 diff -ur linux.orig/drivers/ide/ide-taskfile.c linux/drivers/ide/ide-taskfile.c
187 --- linux.orig/drivers/ide/ide-taskfile.c Sun Nov 17 16:55:17 2002
188 +++ linux/drivers/ide/ide-taskfile.c Sun Nov 17 16:58:56 2002
190 #include <linux/pci.h>
191 #include <linux/delay.h>
192 #include <linux/hdreg.h>
193 -#include <linux/ide.h>
195 #include <asm/byteorder.h>
197 #include <asm/uaccess.h>
199 #include <asm/bitops.h>
200 +#include <linux/ide.h>
202 #ifdef CONFIG_IDE_TASKFILE_IO
203 # define __TASKFILE__IO
204 diff -ur linux.orig/drivers/ide/ide.c linux/drivers/ide/ide.c
205 --- linux.orig/drivers/ide/ide.c Sun Nov 17 16:55:17 2002
206 +++ linux/drivers/ide/ide.c Sun Nov 17 16:59:43 2002
207 @@ -145,13 +145,13 @@
209 #include <linux/pci.h>
210 #include <linux/delay.h>
211 -#include <linux/ide.h>
212 #include <linux/reboot.h>
214 #include <asm/byteorder.h>
216 #include <asm/uaccess.h>
218 +#include <linux/ide.h>
219 #include <asm/bitops.h>
221 #include "ide_modes.h"
222 diff -ur linux.orig/drivers/ide/ns87415.c linux/drivers/ide/ns87415.c
223 --- linux.orig/drivers/ide/ns87415.c Sun Nov 17 16:55:17 2002
224 +++ linux/drivers/ide/ns87415.c Sun Nov 17 17:00:02 2002
226 #include <linux/hdreg.h>
227 #include <linux/pci.h>
228 #include <linux/delay.h>
229 -#include <linux/ide.h>
230 #include <linux/init.h>
233 +#include <linux/ide.h>
235 static unsigned int ns87415_count = 0, ns87415_control[MAX_HWIFS] = { 0 };
237 --- linux.orig/drivers/scsi/ide-scsi.c Sun Nov 17 21:43:01 2002
238 +++ linux/drivers/scsi/ide-scsi.c Sun Nov 17 22:33:15 2002
240 #include <linux/errno.h>
241 #include <linux/hdreg.h>
242 #include <linux/slab.h>
243 -#include <linux/ide.h>
246 +#include <linux/ide.h>
247 #include <asm/bitops.h>
248 #include <asm/uaccess.h>