]>
Commit | Line | Data |
---|---|---|
d3bb7472 | 1 | --- linux/drivers/block/cmd64x.c.old Thu Feb 8 03:42:17 2001 |
2 | +++ linux/drivers/block/cmd64x.c Thu Feb 8 10:02:16 2001 | |
3 | @@ -19,9 +19,9 @@ | |
4 | #include <linux/delay.h> | |
5 | #include <linux/init.h> | |
6 | #include <linux/hdreg.h> | |
7 | -#include <linux/ide.h> | |
8 | ||
9 | #include <asm/io.h> | |
10 | +#include <linux/ide.h> | |
11 | ||
12 | #include "ide_modes.h" | |
13 | ||
14 | --- linux/drivers/block/ide.c.old Thu Feb 8 03:42:18 2001 | |
15 | +++ linux/drivers/block/ide.c Thu Feb 8 09:08:19 2001 | |
16 | @@ -138,13 +138,13 @@ | |
17 | #endif /* MODULE */ | |
18 | #include <linux/pci.h> | |
19 | #include <linux/delay.h> | |
20 | -#include <linux/ide.h> | |
21 | ||
22 | #include <asm/byteorder.h> | |
23 | #include <asm/irq.h> | |
24 | #include <asm/uaccess.h> | |
25 | #include <asm/io.h> | |
26 | #include <asm/bitops.h> | |
27 | +#include <linux/ide.h> | |
28 | ||
29 | #include "ide_modes.h" | |
30 | ||
31 | --- linux/drivers/block/ide-dma.c.old Thu Feb 8 10:19:26 2001 | |
32 | +++ linux/drivers/block/ide-dma.c Thu Feb 8 10:19:37 2001 | |
33 | @@ -86,10 +86,10 @@ | |
34 | #include <linux/interrupt.h> | |
35 | #include <linux/pci.h> | |
36 | #include <linux/init.h> | |
37 | -#include <linux/ide.h> | |
38 | ||
39 | #include <asm/io.h> | |
40 | #include <asm/irq.h> | |
41 | +#include <linux/ide.h> | |
42 | ||
43 | #undef CONFIG_BLK_DEV_IDEDMA_TIMEOUT | |
44 | ||
45 | --- linux/drivers/block/ide-features.c.old Thu Feb 8 03:42:18 2001 | |
46 | +++ linux/drivers/block/ide-features.c Thu Feb 8 09:51:07 2001 | |
47 | @@ -28,13 +28,13 @@ | |
48 | #include <linux/pci.h> | |
49 | #include <linux/delay.h> | |
50 | #include <linux/hdreg.h> | |
51 | -#include <linux/ide.h> | |
52 | ||
53 | #include <asm/byteorder.h> | |
54 | #include <asm/irq.h> | |
55 | #include <asm/uaccess.h> | |
56 | #include <asm/io.h> | |
57 | #include <asm/bitops.h> | |
58 | +#include <linux/ide.h> | |
59 | ||
60 | /* | |
61 | * A Verbose noise maker for debugging on the attempted transfer rates. | |
62 | --- linux/drivers/block/ide-pci.c.old Thu Feb 8 10:22:01 2001 | |
63 | +++ linux/drivers/block/ide-pci.c Thu Feb 8 10:22:09 2001 | |
64 | @@ -20,10 +20,10 @@ | |
65 | #include <linux/interrupt.h> | |
66 | #include <linux/pci.h> | |
67 | #include <linux/init.h> | |
68 | -#include <linux/ide.h> | |
69 | ||
70 | #include <asm/io.h> | |
71 | #include <asm/irq.h> | |
72 | +#include <linux/ide.h> | |
73 | ||
74 | #define DEVID_PIIXa ((ide_pci_devid_t){PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82371FB_0}) | |
75 | #define DEVID_PIIXb ((ide_pci_devid_t){PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82371FB_1}) | |
76 | --- linux/drivers/block/ide-probe.c.old Thu Feb 8 03:42:18 2001 | |
77 | +++ linux/drivers/block/ide-probe.c Thu Feb 8 11:16:51 2001 | |
78 | @@ -41,12 +41,12 @@ | |
79 | #include <linux/malloc.h> | |
80 | #include <linux/delay.h> | |
81 | #include <linux/mc146818rtc.h> /* CMOS defines */ | |
82 | -#include <linux/ide.h> | |
83 | ||
84 | #include <asm/byteorder.h> | |
85 | #include <asm/irq.h> | |
86 | #include <asm/uaccess.h> | |
87 | #include <asm/io.h> | |
88 | +#include <linux/ide.h> | |
89 | ||
90 | static inline void do_identify (ide_drive_t *drive, byte cmd) | |
91 | { | |
92 | --- linux/drivers/block/ide-proc.c.old Thu Feb 8 03:42:18 2001 | |
93 | +++ linux/drivers/block/ide-proc.c Thu Feb 8 11:15:07 2001 | |
94 | @@ -65,9 +65,9 @@ | |
95 | #include <linux/mm.h> | |
96 | #include <linux/pci.h> | |
97 | #include <linux/ctype.h> | |
98 | -#include <linux/ide.h> | |
99 | ||
100 | #include <asm/io.h> | |
101 | +#include <linux/ide.h> | |
102 | ||
103 | #ifndef MIN | |
104 | #define MIN(a,b) (((a) < (b)) ? (a) : (b)) | |
105 | --- linux/drivers/block/ide-taskfile.c.old Thu Feb 8 03:42:18 2001 | |
106 | +++ linux/drivers/block/ide-taskfile.c Thu Feb 8 09:59:21 2001 | |
107 | @@ -25,13 +25,13 @@ | |
108 | #include <linux/pci.h> | |
109 | #include <linux/delay.h> | |
110 | #include <linux/hdreg.h> | |
111 | -#include <linux/ide.h> | |
112 | ||
113 | #include <asm/byteorder.h> | |
114 | #include <asm/irq.h> | |
115 | #include <asm/uaccess.h> | |
116 | #include <asm/io.h> | |
117 | #include <asm/bitops.h> | |
118 | +#include <linux/ide.h> | |
119 | ||
120 | #define DEBUG_TASKFILE 0 /* unset when fixed */ | |
121 | ||
122 | --- linux/drivers/block/ns87415.c.old Thu Feb 8 03:42:18 2001 | |
123 | +++ linux/drivers/block/ns87415.c Thu Feb 8 10:56:30 2001 | |
124 | @@ -17,9 +17,9 @@ | |
125 | #include <linux/hdreg.h> | |
126 | #include <linux/pci.h> | |
127 | #include <linux/delay.h> | |
128 | -#include <linux/ide.h> | |
129 | ||
130 | #include <asm/io.h> | |
131 | +#include <linux/ide.h> | |
132 | ||
133 | static unsigned int ns87415_count = 0, ns87415_control[MAX_HWIFS] = { 0 }; | |
134 | ||
135 | --- linux/drivers/block/ide-tape.c.old Thu Feb 8 10:26:05 2001 | |
136 | +++ linux/drivers/block/ide-tape.c Thu Feb 8 11:18:45 2001 | |
137 | @@ -400,7 +400,6 @@ | |
138 | #include <linux/genhd.h> | |
139 | #include <linux/malloc.h> | |
140 | #include <linux/pci.h> | |
141 | -#include <linux/ide.h> | |
142 | ||
143 | #include <asm/byteorder.h> | |
144 | #include <asm/irq.h> | |
145 | @@ -408,6 +407,7 @@ | |
146 | #include <asm/io.h> | |
147 | #include <asm/unaligned.h> | |
148 | #include <asm/bitops.h> | |
149 | +#include <linux/ide.h> | |
150 | ||
151 | #define NO_LONGER_REQUIRED (1) | |
152 | ||
153 | --- linux/drivers/block/ide-disk.c.old Thu Feb 8 03:42:18 2001 | |
154 | +++ linux/drivers/block/ide-disk.c Thu Feb 8 10:22:43 2001 | |
155 | @@ -48,12 +48,12 @@ | |
156 | #include <linux/genhd.h> | |
157 | #include <linux/malloc.h> | |
158 | #include <linux/delay.h> | |
159 | -#include <linux/ide.h> | |
160 | ||
161 | #include <asm/byteorder.h> | |
162 | #include <asm/irq.h> | |
163 | #include <asm/uaccess.h> | |
164 | #include <asm/io.h> | |
165 | +#include <linux/ide.h> | |
166 | #include <asm/ide.h> | |
167 | ||
168 | #ifdef CONFIG_BLK_DEV_PDC4030 | |
169 | --- linux/drivers/block/ide-cd.c.old Thu Feb 8 03:42:17 2001 | |
170 | +++ linux/drivers/block/ide-cd.c Thu Feb 8 10:23:07 2001 | |
171 | @@ -299,13 +299,13 @@ | |
172 | #include <linux/interrupt.h> | |
173 | #include <linux/errno.h> | |
174 | #include <linux/cdrom.h> | |
175 | -#include <linux/ide.h> | |
176 | ||
177 | #include <asm/irq.h> | |
178 | #include <asm/io.h> | |
179 | #include <asm/byteorder.h> | |
180 | #include <asm/uaccess.h> | |
181 | #include <asm/unaligned.h> | |
182 | +#include <linux/ide.h> | |
183 | ||
184 | #include "ide-cd.h" | |
185 | ||
186 | --- linux/drivers/block/ide-floppy.c.old Thu Feb 8 03:42:18 2001 | |
187 | +++ linux/drivers/block/ide-floppy.c Thu Feb 8 10:26:21 2001 | |
188 | @@ -62,7 +62,6 @@ | |
189 | #include <linux/genhd.h> | |
190 | #include <linux/malloc.h> | |
191 | #include <linux/cdrom.h> | |
192 | -#include <linux/ide.h> | |
193 | ||
194 | #include <asm/byteorder.h> | |
195 | #include <asm/irq.h> | |
196 | @@ -70,6 +69,7 @@ | |
197 | #include <asm/io.h> | |
198 | #include <asm/unaligned.h> | |
199 | #include <asm/bitops.h> | |
200 | +#include <linux/ide.h> | |
201 | ||
202 | /* | |
203 | * The following are used to debug the driver. | |
204 | --- linux/arch/sparc64/config.in.old Thu Feb 8 10:10:53 2001 | |
205 | +++ linux/arch/sparc64/config.in Thu Feb 8 10:15:42 2001 | |
206 | @@ -138,6 +138,7 @@ | |
207 | define_bool CONFIG_IDEDMA_AUTO y | |
208 | define_bool CONFIG_BLK_DEV_NS87415 y | |
209 | define_bool CONFIG_BLK_DEV_CMD64X y | |
210 | + define_bool CONFIG_BLK_DEV_IDE_MODES y | |
211 | fi | |
212 | fi | |
213 |