diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-04 16:31:00 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-04 16:31:00 -0500 |
| commit | 20b0f65d35ae45d43f363ace3744a775a752d265 (patch) | |
| tree | 6085d058cb5ce12bc07368ed897c3689f5239389 /include/linux | |
| parent | 70077f2fab35ed3d73631fc47d8c572b560ecabd (diff) | |
| parent | 849138827c962589ac50496fa7feeb2a2d51b467 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6:
ide: make legacy IDE VLB modules check for the "probe" kernel params (v2)
ide: remove some obsoleted kernel params (v2)
ide/pci/delkin_cb.c: pci_module_init to pci_register_driver
scc_pata: bugfix for checking DMA IRQ status
ide: remove a ton of pointless #undef REALLY_SLOW_IO
siimage: DRAC4 note
adjust legacy IDE resource setting (v2)
ide: fix pmac breakage
ide-cs: Update device table
ide: ide_get_best_pio_mode() returns incorrect IORDY setting (take 2)
piix/slc90e66: more tuneproc() fixing (take 2)
ide: fix drive side 80c cable check, take 2
cmd64x: fix PIO mode setup (take 3)
alim15x3: fix PIO mode setup
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/ide.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/ide.h b/include/linux/ide.h index 79c028251c70..34f2676b3c62 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h | |||
| @@ -1359,7 +1359,8 @@ u8 ide_dump_status(ide_drive_t *, const char *, u8); | |||
| 1359 | typedef struct ide_pio_timings_s { | 1359 | typedef struct ide_pio_timings_s { |
| 1360 | int setup_time; /* Address setup (ns) minimum */ | 1360 | int setup_time; /* Address setup (ns) minimum */ |
| 1361 | int active_time; /* Active pulse (ns) minimum */ | 1361 | int active_time; /* Active pulse (ns) minimum */ |
| 1362 | int cycle_time; /* Cycle time (ns) minimum = (setup + active + recovery) */ | 1362 | int cycle_time; /* Cycle time (ns) minimum = */ |
| 1363 | /* active + recovery (+ setup for some chips) */ | ||
| 1363 | } ide_pio_timings_t; | 1364 | } ide_pio_timings_t; |
| 1364 | 1365 | ||
| 1365 | typedef struct ide_pio_data_s { | 1366 | typedef struct ide_pio_data_s { |