| 88d76863 |
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 |
| 4 | @@ -133,6 +133,7 @@ |
| 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 |
| 9 | fi |
| 10 | fi |
| 11 | |
| 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 |
| 15 | @@ -19,9 +19,9 @@ |
| 16 | #include <linux/delay.h> |
| 17 | #include <linux/init.h> |
| 18 | #include <linux/hdreg.h> |
| 19 | -#include <linux/ide.h> |
| 20 | |
| 21 | #include <asm/io.h> |
| 22 | +#include <linux/ide.h> |
| 23 | |
| 24 | #include "ide_modes.h" |
| 25 | |
| 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 |
| 29 | @@ -299,13 +299,13 @@ |
| 30 | #include <linux/interrupt.h> |
| 31 | #include <linux/errno.h> |
| 32 | #include <linux/cdrom.h> |
| 33 | -#include <linux/ide.h> |
| 34 | |
| 35 | #include <asm/irq.h> |
| 36 | #include <asm/io.h> |
| 37 | #include <asm/byteorder.h> |
| 38 | #include <asm/uaccess.h> |
| 39 | #include <asm/unaligned.h> |
| 40 | +#include <linux/ide.h> |
| 41 | |
| 42 | #include "ide-cd.h" |
| 43 | |
| 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 |
| 47 | @@ -48,12 +48,12 @@ |
| 48 | #include <linux/genhd.h> |
| 49 | #include <linux/malloc.h> |
| 50 | #include <linux/delay.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 <linux/ide.h> |
| 58 | #include <asm/ide.h> |
| 59 | |
| 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 |
| 64 | @@ -86,10 +86,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 CONFIG_BLK_DEV_IDEDMA_TIMEOUT |
| 75 | |
| 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 |
| 79 | @@ -28,13 +28,13 @@ |
| 80 | #include <linux/pci.h> |
| 81 | #include <linux/delay.h> |
| 82 | #include <linux/hdreg.h> |
| 83 | -#include <linux/ide.h> |
| 84 | |
| 85 | #include <asm/byteorder.h> |
| 86 | #include <asm/irq.h> |
| 87 | #include <asm/uaccess.h> |
| 88 | #include <asm/io.h> |
| 89 | #include <asm/bitops.h> |
| 90 | +#include <linux/ide.h> |
| 91 | |
| 92 | /* |
| 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 |
| 97 | @@ -62,7 +62,6 @@ |
| 98 | #include <linux/genhd.h> |
| 99 | #include <linux/malloc.h> |
| 100 | #include <linux/cdrom.h> |
| 101 | -#include <linux/ide.h> |
| 102 | |
| 103 | #include <asm/byteorder.h> |
| 104 | #include <asm/irq.h> |
| 105 | @@ -70,6 +69,7 @@ |
| 106 | #include <asm/io.h> |
| 107 | #include <asm/unaligned.h> |
| 108 | #include <asm/bitops.h> |
| 109 | +#include <linux/ide.h> |
| 110 | |
| 111 | /* |
| 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 |
| 116 | @@ -5,8 +5,8 @@ |
| 117 | #ifdef __i386__ |
| 118 | #include <linux/mc146818rtc.h> |
| 119 | #endif |
| 120 | -#include <linux/ide.h> |
| 121 | #include <asm/io.h> |
| 122 | +#include <linux/ide.h> |
| 123 | |
| 124 | /* |
| 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 |
| 129 | @@ -20,10 +20,10 @@ |
| 130 | #include <linux/interrupt.h> |
| 131 | #include <linux/pci.h> |
| 132 | #include <linux/init.h> |
| 133 | -#include <linux/ide.h> |
| 134 | |
| 135 | #include <asm/io.h> |
| 136 | #include <asm/irq.h> |
| 137 | +#include <linux/ide.h> |
| 138 | |
| 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 |
| 144 | @@ -41,12 +41,12 @@ |
| 145 | #include <linux/malloc.h> |
| 146 | #include <linux/delay.h> |
| 147 | #include <linux/mc146818rtc.h> /* CMOS defines */ |
| 148 | -#include <linux/ide.h> |
| 149 | |
| 150 | #include <asm/byteorder.h> |
| 151 | #include <asm/irq.h> |
| 152 | #include <asm/uaccess.h> |
| 153 | #include <asm/io.h> |
| 154 | +#include <linux/ide.h> |
| 155 | |
| 156 | static inline void do_identify (ide_drive_t *drive, byte cmd) |
| 157 | { |
| 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 |
| 161 | @@ -65,9 +65,9 @@ |
| 162 | #include <linux/mm.h> |
| 163 | #include <linux/pci.h> |
| 164 | #include <linux/ctype.h> |
| 165 | -#include <linux/ide.h> |
| 166 | |
| 167 | #include <asm/io.h> |
| 168 | +#include <linux/ide.h> |
| 169 | |
| 170 | #ifndef MIN |
| 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 |
| 175 | @@ -411,7 +411,6 @@ |
| 176 | #include <linux/genhd.h> |
| 177 | #include <linux/malloc.h> |
| 178 | #include <linux/pci.h> |
| 179 | -#include <linux/ide.h> |
| 180 | |
| 181 | #include <asm/byteorder.h> |
| 182 | #include <asm/irq.h> |
| 183 | @@ -419,6 +418,7 @@ |
| 184 | #include <asm/io.h> |
| 185 | #include <asm/unaligned.h> |
| 186 | #include <asm/bitops.h> |
| 187 | +#include <linux/ide.h> |
| 188 | |
| 189 | #define NO_LONGER_REQUIRED (1) |
| 190 | |
| 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 |
| 194 | @@ -25,13 +25,13 @@ |
| 195 | #include <linux/pci.h> |
| 196 | #include <linux/delay.h> |
| 197 | #include <linux/hdreg.h> |
| 198 | -#include <linux/ide.h> |
| 199 | |
| 200 | #include <asm/byteorder.h> |
| 201 | #include <asm/irq.h> |
| 202 | #include <asm/uaccess.h> |
| 203 | #include <asm/io.h> |
| 204 | #include <asm/bitops.h> |
| 205 | +#include <linux/ide.h> |
| 206 | |
| 207 | #define DEBUG_TASKFILE 0 /* unset when fixed */ |
| 208 | |
| 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 @@ |
| 213 | #endif /* MODULE */ |
| 214 | #include <linux/pci.h> |
| 215 | #include <linux/delay.h> |
| 216 | -#include <linux/ide.h> |
| 217 | |
| 218 | #include <asm/byteorder.h> |
| 219 | #include <asm/irq.h> |
| 220 | #include <asm/uaccess.h> |
| 221 | #include <asm/io.h> |
| 222 | #include <asm/bitops.h> |
| 223 | +#include <linux/ide.h> |
| 224 | |
| 225 | #include "ide_modes.h" |
| 226 | |
| 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 |
| 230 | @@ -17,9 +17,9 @@ |
| 231 | #include <linux/hdreg.h> |
| 232 | #include <linux/pci.h> |
| 233 | #include <linux/delay.h> |
| 234 | -#include <linux/ide.h> |
| 235 | |
| 236 | #include <asm/io.h> |
| 237 | +#include <linux/ide.h> |
| 238 | |
| 239 | static unsigned int ns87415_count = 0, ns87415_control[MAX_HWIFS] = { 0 }; |
| 240 | |
projects / packages / kernel.git / blame