| 67e257e4 |
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 |
| 4 | @@ -19,10 +19,10 @@ |
| 5 | #include <linux/pci.h> |
| 88d76863 |
6 | #include <linux/delay.h> |
| 88d76863 |
7 | #include <linux/hdreg.h> |
| 8 | -#include <linux/ide.h> |
| 67e257e4 |
9 | #include <linux/init.h> |
| 88d76863 |
10 | |
| 11 | #include <asm/io.h> |
| 12 | +#include <linux/ide.h> |
| 13 | |
| 14 | #include "ide_modes.h" |
| 15 | |
| 67e257e4 |
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 |
| 21 | @@ -307,13 +307,13 @@ |
| 88d76863 |
22 | #include <linux/interrupt.h> |
| 23 | #include <linux/errno.h> |
| 24 | #include <linux/cdrom.h> |
| 25 | -#include <linux/ide.h> |
| 26 | |
| 27 | #include <asm/irq.h> |
| 28 | #include <asm/io.h> |
| 29 | #include <asm/byteorder.h> |
| 30 | #include <asm/uaccess.h> |
| 31 | #include <asm/unaligned.h> |
| 32 | +#include <linux/ide.h> |
| 33 | |
| 34 | #include "ide-cd.h" |
| 35 | |
| 67e257e4 |
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 |
| 39 | @@ -49,12 +49,12 @@ |
| 88d76863 |
40 | #include <linux/genhd.h> |
| 67e257e4 |
41 | #include <linux/slab.h> |
| 88d76863 |
42 | #include <linux/delay.h> |
| 43 | -#include <linux/ide.h> |
| 44 | |
| 45 | #include <asm/byteorder.h> |
| 46 | #include <asm/irq.h> |
| 47 | #include <asm/uaccess.h> |
| 48 | #include <asm/io.h> |
| 49 | +#include <linux/ide.h> |
| 88d76863 |
50 | |
| 51 | #ifdef CONFIG_BLK_DEV_PDC4030 |
| 67e257e4 |
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 |
| 88d76863 |
58 | @@ -86,10 +86,10 @@ |
| 59 | #include <linux/interrupt.h> |
| 60 | #include <linux/pci.h> |
| 61 | #include <linux/init.h> |
| 62 | -#include <linux/ide.h> |
| 63 | |
| 64 | #include <asm/io.h> |
| 65 | #include <asm/irq.h> |
| 66 | +#include <linux/ide.h> |
| 67 | |
| 67e257e4 |
68 | #include <linux/kcomp.h> |
| 88d76863 |
69 | |
| 67e257e4 |
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 |
| 73 | @@ -30,13 +30,13 @@ |
| 88d76863 |
74 | #include <linux/pci.h> |
| 75 | #include <linux/delay.h> |
| 76 | #include <linux/hdreg.h> |
| 77 | -#include <linux/ide.h> |
| 78 | |
| 79 | #include <asm/byteorder.h> |
| 80 | #include <asm/irq.h> |
| 81 | #include <asm/uaccess.h> |
| 82 | #include <asm/io.h> |
| 83 | #include <asm/bitops.h> |
| 84 | +#include <linux/ide.h> |
| 85 | |
| 86 | /* |
| 87 | * A Verbose noise maker for debugging on the attempted transfer rates. |
| 67e257e4 |
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 |
| 91 | @@ -97,7 +97,6 @@ |
| 88d76863 |
92 | #include <linux/genhd.h> |
| 67e257e4 |
93 | #include <linux/slab.h> |
| 88d76863 |
94 | #include <linux/cdrom.h> |
| 95 | -#include <linux/ide.h> |
| 96 | |
| 97 | #include <asm/byteorder.h> |
| 98 | #include <asm/irq.h> |
| 67e257e4 |
99 | @@ -105,6 +104,7 @@ |
| 88d76863 |
100 | #include <asm/io.h> |
| 101 | #include <asm/unaligned.h> |
| 102 | #include <asm/bitops.h> |
| 103 | +#include <linux/ide.h> |
| 104 | |
| 105 | /* |
| 106 | * The following are used to debug the driver. |
| 67e257e4 |
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 |
| 110 | @@ -2,9 +2,9 @@ |
| 111 | * linux/drivers/ide/ide-geometry.c |
| 112 | */ |
| 113 | #include <linux/config.h> |
| 88d76863 |
114 | -#include <linux/ide.h> |
| 67e257e4 |
115 | #include <linux/mc146818rtc.h> |
| 88d76863 |
116 | #include <asm/io.h> |
| 117 | +#include <linux/ide.h> |
| 118 | |
| 67e257e4 |
119 | #ifdef CONFIG_BLK_DEV_IDE |
| 120 | |
| 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 |
| 124 | @@ -28,10 +28,10 @@ |
| 88d76863 |
125 | #include <linux/interrupt.h> |
| 126 | #include <linux/pci.h> |
| 127 | #include <linux/init.h> |
| 128 | -#include <linux/ide.h> |
| 129 | |
| 130 | #include <asm/io.h> |
| 131 | #include <asm/irq.h> |
| 132 | +#include <linux/ide.h> |
| 133 | |
| 67e257e4 |
134 | #include "idecomp.h" |
| 135 | |
| 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 |
| 139 | @@ -46,12 +46,12 @@ |
| 88d76863 |
140 | #include <linux/malloc.h> |
| 141 | #include <linux/delay.h> |
| 142 | #include <linux/mc146818rtc.h> /* CMOS defines */ |
| 143 | -#include <linux/ide.h> |
| 144 | |
| 145 | #include <asm/byteorder.h> |
| 146 | #include <asm/irq.h> |
| 147 | #include <asm/uaccess.h> |
| 148 | #include <asm/io.h> |
| 149 | +#include <linux/ide.h> |
| 150 | |
| 151 | static inline void do_identify (ide_drive_t *drive, byte cmd) |
| 152 | { |
| 67e257e4 |
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 |
| 88d76863 |
156 | @@ -65,9 +65,9 @@ |
| 157 | #include <linux/mm.h> |
| 158 | #include <linux/pci.h> |
| 159 | #include <linux/ctype.h> |
| 160 | -#include <linux/ide.h> |
| 161 | |
| 162 | #include <asm/io.h> |
| 163 | +#include <linux/ide.h> |
| 164 | |
| 67e257e4 |
165 | #include "idecomp.h" |
| 166 | |
| 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 |
| 170 | @@ -417,7 +417,6 @@ |
| 88d76863 |
171 | #include <linux/genhd.h> |
| 67e257e4 |
172 | #include <linux/slab.h> |
| 88d76863 |
173 | #include <linux/pci.h> |
| 174 | -#include <linux/ide.h> |
| 175 | |
| 176 | #include <asm/byteorder.h> |
| 177 | #include <asm/irq.h> |
| 67e257e4 |
178 | @@ -425,6 +424,7 @@ |
| 88d76863 |
179 | #include <asm/io.h> |
| 180 | #include <asm/unaligned.h> |
| 181 | #include <asm/bitops.h> |
| 182 | +#include <linux/ide.h> |
| 183 | |
| 88d76863 |
184 | |
| 67e257e4 |
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 |
| 88d76863 |
189 | @@ -25,13 +25,13 @@ |
| 190 | #include <linux/pci.h> |
| 191 | #include <linux/delay.h> |
| 192 | #include <linux/hdreg.h> |
| 193 | -#include <linux/ide.h> |
| 194 | |
| 195 | #include <asm/byteorder.h> |
| 196 | #include <asm/irq.h> |
| 197 | #include <asm/uaccess.h> |
| 198 | #include <asm/io.h> |
| 199 | #include <asm/bitops.h> |
| 200 | +#include <linux/ide.h> |
| 201 | |
| 67e257e4 |
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 @@ |
| 88d76863 |
208 | #endif /* MODULE */ |
| 209 | #include <linux/pci.h> |
| 210 | #include <linux/delay.h> |
| 211 | -#include <linux/ide.h> |
| 67e257e4 |
212 | #include <linux/reboot.h> |
| 88d76863 |
213 | |
| 214 | #include <asm/byteorder.h> |
| 215 | #include <asm/irq.h> |
| 216 | #include <asm/uaccess.h> |
| 217 | #include <asm/io.h> |
| 88d76863 |
218 | +#include <linux/ide.h> |
| 67e257e4 |
219 | #include <asm/bitops.h> |
| 88d76863 |
220 | |
| 221 | #include "ide_modes.h" |
| 67e257e4 |
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 |
| 225 | @@ -19,10 +19,10 @@ |
| 88d76863 |
226 | #include <linux/hdreg.h> |
| 227 | #include <linux/pci.h> |
| 228 | #include <linux/delay.h> |
| 229 | -#include <linux/ide.h> |
| 67e257e4 |
230 | #include <linux/init.h> |
| 88d76863 |
231 | |
| 232 | #include <asm/io.h> |
| 233 | +#include <linux/ide.h> |
| 234 | |
| 235 | static unsigned int ns87415_count = 0, ns87415_control[MAX_HWIFS] = { 0 }; |
| 236 | |
| 81052580 |
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 |
| 239 | @@ -41,9 +41,9 @@ |
| 240 | #include <linux/errno.h> |
| 241 | #include <linux/hdreg.h> |
| 242 | #include <linux/slab.h> |
| 243 | -#include <linux/ide.h> |
| 244 | |
| 245 | #include <asm/io.h> |
| 246 | +#include <linux/ide.h> |
| 247 | #include <asm/bitops.h> |
| 248 | #include <asm/uaccess.h> |
| 249 | |
projects / packages / kernel.git / blame