1 diff -uNr linux/arch/sparc64/config.in linux-2.2.19/arch/sparc64/config.in
2 --- linux/arch/sparc64/config.in Sun May 20 18:10:13 2001
3 +++ linux-2.2.19/arch/sparc64/config.in Sun May 20 17:39:10 2001
5 define_bool CONFIG_IDEDMA_AUTO y
6 define_bool CONFIG_BLK_DEV_NS87415 y
7 define_bool CONFIG_BLK_DEV_CMD64X y
8 + define_bool CONFIG_BLK_DEV_IDE_MODES y
12 diff -uNr linux/drivers/block/cmd64x.c linux-2.2.19/drivers/block/cmd64x.c
13 --- linux/drivers/block/cmd64x.c Sun May 20 18:10:14 2001
14 +++ linux-2.2.19/drivers/block/cmd64x.c Sun May 20 17:39:10 2001
16 #include <linux/delay.h>
17 #include <linux/init.h>
18 #include <linux/hdreg.h>
19 -#include <linux/ide.h>
22 +#include <linux/ide.h>
24 #include "ide_modes.h"
26 diff -uNr linux/drivers/block/ide-cd.c linux-2.2.19/drivers/block/ide-cd.c
27 --- linux/drivers/block/ide-cd.c Sun May 20 18:10:14 2001
28 +++ linux-2.2.19/drivers/block/ide-cd.c Sun May 20 17:39:10 2001
30 #include <linux/interrupt.h>
31 #include <linux/errno.h>
32 #include <linux/cdrom.h>
33 -#include <linux/ide.h>
37 #include <asm/byteorder.h>
38 #include <asm/uaccess.h>
39 #include <asm/unaligned.h>
40 +#include <linux/ide.h>
44 diff -uNr linux/drivers/block/ide-disk.c linux-2.2.19/drivers/block/ide-disk.c
45 --- linux/drivers/block/ide-disk.c Sun May 20 18:10:14 2001
46 +++ linux-2.2.19/drivers/block/ide-disk.c Sun May 20 17:39:10 2001
48 #include <linux/genhd.h>
49 #include <linux/malloc.h>
50 #include <linux/delay.h>
51 -#include <linux/ide.h>
53 #include <asm/byteorder.h>
55 #include <asm/uaccess.h>
57 +#include <linux/ide.h>
60 #ifdef CONFIG_BLK_DEV_PDC4030
61 diff -uNr linux/drivers/block/ide-dma.c linux-2.2.19/drivers/block/ide-dma.c
62 --- linux/drivers/block/ide-dma.c Sun May 20 18:10:14 2001
63 +++ linux-2.2.19/drivers/block/ide-dma.c Sun May 20 17:39:10 2001
65 #include <linux/interrupt.h>
66 #include <linux/pci.h>
67 #include <linux/init.h>
68 -#include <linux/ide.h>
72 +#include <linux/ide.h>
74 #define CONFIG_BLK_DEV_IDEDMA_TIMEOUT
76 diff -uNr linux/drivers/block/ide-features.c linux-2.2.19/drivers/block/ide-features.c
77 --- linux/drivers/block/ide-features.c Sun May 20 18:10:14 2001
78 +++ linux-2.2.19/drivers/block/ide-features.c Sun May 20 17:39:10 2001
80 #include <linux/pci.h>
81 #include <linux/delay.h>
82 #include <linux/hdreg.h>
83 -#include <linux/ide.h>
85 #include <asm/byteorder.h>
87 #include <asm/uaccess.h>
89 #include <asm/bitops.h>
90 +#include <linux/ide.h>
93 * A Verbose noise maker for debugging on the attempted transfer rates.
94 diff -uNr linux/drivers/block/ide-floppy.c linux-2.2.19/drivers/block/ide-floppy.c
95 --- linux/drivers/block/ide-floppy.c Sun May 20 18:10:14 2001
96 +++ linux-2.2.19/drivers/block/ide-floppy.c Sun May 20 17:39:10 2001
98 #include <linux/genhd.h>
99 #include <linux/malloc.h>
100 #include <linux/cdrom.h>
101 -#include <linux/ide.h>
103 #include <asm/byteorder.h>
107 #include <asm/unaligned.h>
108 #include <asm/bitops.h>
109 +#include <linux/ide.h>
112 * The following are used to debug the driver.
113 diff -uNr linux/drivers/block/ide-geometry.c linux-2.2.19/drivers/block/ide-geometry.c
114 --- linux/drivers/block/ide-geometry.c Sun May 20 18:10:14 2001
115 +++ linux-2.2.19/drivers/block/ide-geometry.c Sun May 20 17:53:23 2001
118 #include <linux/mc146818rtc.h>
120 -#include <linux/ide.h>
122 +#include <linux/ide.h>
125 * We query CMOS about hard disks : it could be that we have a SCSI/ESDI/etc
126 diff -uNr linux/drivers/block/ide-pci.c linux-2.2.19/drivers/block/ide-pci.c
127 --- linux/drivers/block/ide-pci.c Sun May 20 18:10:14 2001
128 +++ linux-2.2.19/drivers/block/ide-pci.c Sun May 20 17:39:10 2001
130 #include <linux/interrupt.h>
131 #include <linux/pci.h>
132 #include <linux/init.h>
133 -#include <linux/ide.h>
137 +#include <linux/ide.h>
139 #define DEVID_PIIXa ((ide_pci_devid_t){PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82371FB_0})
140 #define DEVID_PIIXb ((ide_pci_devid_t){PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82371FB_1})
141 diff -uNr linux/drivers/block/ide-probe.c linux-2.2.19/drivers/block/ide-probe.c
142 --- linux/drivers/block/ide-probe.c Sun May 20 18:10:14 2001
143 +++ linux-2.2.19/drivers/block/ide-probe.c Sun May 20 17:39:10 2001
145 #include <linux/malloc.h>
146 #include <linux/delay.h>
147 #include <linux/mc146818rtc.h> /* CMOS defines */
148 -#include <linux/ide.h>
150 #include <asm/byteorder.h>
152 #include <asm/uaccess.h>
154 +#include <linux/ide.h>
156 static inline void do_identify (ide_drive_t *drive, byte cmd)
158 diff -uNr linux/drivers/block/ide-proc.c linux-2.2.19/drivers/block/ide-proc.c
159 --- linux/drivers/block/ide-proc.c Sun May 20 18:10:14 2001
160 +++ linux-2.2.19/drivers/block/ide-proc.c Sun May 20 17:39:10 2001
162 #include <linux/mm.h>
163 #include <linux/pci.h>
164 #include <linux/ctype.h>
165 -#include <linux/ide.h>
168 +#include <linux/ide.h>
171 #define MIN(a,b) (((a) < (b)) ? (a) : (b))
172 diff -uNr linux/drivers/block/ide-tape.c linux-2.2.19/drivers/block/ide-tape.c
173 --- linux/drivers/block/ide-tape.c Sun May 20 18:10:14 2001
174 +++ linux-2.2.19/drivers/block/ide-tape.c Sun May 20 17:39:10 2001
176 #include <linux/genhd.h>
177 #include <linux/malloc.h>
178 #include <linux/pci.h>
179 -#include <linux/ide.h>
181 #include <asm/byteorder.h>
185 #include <asm/unaligned.h>
186 #include <asm/bitops.h>
187 +#include <linux/ide.h>
189 #define NO_LONGER_REQUIRED (1)
191 diff -uNr linux/drivers/block/ide-taskfile.c linux-2.2.19/drivers/block/ide-taskfile.c
192 --- linux/drivers/block/ide-taskfile.c Sun May 20 18:10:14 2001
193 +++ linux-2.2.19/drivers/block/ide-taskfile.c Sun May 20 17:39:10 2001
195 #include <linux/pci.h>
196 #include <linux/delay.h>
197 #include <linux/hdreg.h>
198 -#include <linux/ide.h>
200 #include <asm/byteorder.h>
202 #include <asm/uaccess.h>
204 #include <asm/bitops.h>
205 +#include <linux/ide.h>
207 #define DEBUG_TASKFILE 0 /* unset when fixed */
209 diff -uNr linux/drivers/block/ide.c linux-2.2.19/drivers/block/ide.c
210 --- linux/drivers/block/ide.c Sun May 20 18:10:14 2001
211 +++ linux-2.2.19/drivers/block/ide.c Sun May 20 17:39:10 2001
212 @@ -138,13 +138,13 @@
214 #include <linux/pci.h>
215 #include <linux/delay.h>
216 -#include <linux/ide.h>
218 #include <asm/byteorder.h>
220 #include <asm/uaccess.h>
222 #include <asm/bitops.h>
223 +#include <linux/ide.h>
225 #include "ide_modes.h"
227 diff -uNr linux/drivers/block/ns87415.c linux-2.2.19/drivers/block/ns87415.c
228 --- linux/drivers/block/ns87415.c Sun May 20 18:10:14 2001
229 +++ linux-2.2.19/drivers/block/ns87415.c Sun May 20 17:39:10 2001
231 #include <linux/hdreg.h>
232 #include <linux/pci.h>
233 #include <linux/delay.h>
234 -#include <linux/ide.h>
237 +#include <linux/ide.h>
239 static unsigned int ns87415_count = 0, ns87415_control[MAX_HWIFS] = { 0 };