diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-24 11:05:29 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-24 11:05:29 -0400 |
| commit | 7e125f7b9cbfce4101191b8076d606c517a73066 (patch) | |
| tree | ded140947b146cc7177519cd23cf81912de32687 /include/linux/ide.h | |
| parent | 064e297c324fff9b62226aae5dc468ebb272433c (diff) | |
| parent | a9ddabc52ce3757a4331d6c1e8bf4065333cc51b (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6:
cmd640: fix kernel oops in test_irq() method
pdc202xx_old: ignore "FIFO empty" bit in test_irq() method
pdc202xx_old: wire test_irq() method for PDC2026x
IDE: pass IRQ flags to the IDE core
ide: fix comment typo in ide.h
Diffstat (limited to 'include/linux/ide.h')
| -rw-r--r-- | include/linux/ide.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/ide.h b/include/linux/ide.h index b6d448048ae2..7b02aa5ce9b4 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h | |||
| @@ -516,8 +516,8 @@ struct ide_drive_s { | |||
| 516 | u8 current_speed; /* current transfer rate set */ | 516 | u8 current_speed; /* current transfer rate set */ |
| 517 | u8 desired_speed; /* desired transfer rate set */ | 517 | u8 desired_speed; /* desired transfer rate set */ |
| 518 | u8 pio_mode; /* for ->set_pio_mode _only_ */ | 518 | u8 pio_mode; /* for ->set_pio_mode _only_ */ |
| 519 | u8 dma_mode; /* for ->dma_pio_mode _only_ */ | 519 | u8 dma_mode; /* for ->set_dma_mode _only_ */ |
| 520 | u8 dn; /* now wide spread use */ | 520 | u8 dn; /* now wide spread use */ |
| 521 | u8 acoustic; /* acoustic management */ | 521 | u8 acoustic; /* acoustic management */ |
| 522 | u8 media; /* disk, cdrom, tape, floppy, ... */ | 522 | u8 media; /* disk, cdrom, tape, floppy, ... */ |
| 523 | u8 ready_stat; /* min status value for drive ready */ | 523 | u8 ready_stat; /* min status value for drive ready */ |