diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-21 20:44:34 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-21 20:44:34 -0400 |
| commit | 04fc5fd39e09c460fd478ea84b34c445dd376759 (patch) | |
| tree | 320731ed5046fc33f77ad957bb3fd7b5eaa4b5fe /include | |
| parent | 8aee74c8ee875448cc6d1cf995c9469eb60ae515 (diff) | |
| parent | 8bc3fc470eb25af4d70c72485cbcb130cc657691 (diff) | |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
libata: bump versions
libata: Trim trailing whitespace
libata: Kiss post_set_mode goodbye
ata_piix: clean up
pata_hpt366: Enable bits are unreliable so don't use them
libata: Add Seagate STT20000A to DMA blacklist.
ahci: disable 64bit dma on sb600
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/libata.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/libata.h b/include/linux/libata.h index 666592ef0b2..85f7b1bd148 100644 --- a/include/linux/libata.h +++ b/include/linux/libata.h | |||
| @@ -574,8 +574,6 @@ struct ata_port_operations { | |||
| 574 | void (*phy_reset) (struct ata_port *ap); /* obsolete */ | 574 | void (*phy_reset) (struct ata_port *ap); /* obsolete */ |
| 575 | int (*set_mode) (struct ata_port *ap, struct ata_device **r_failed_dev); | 575 | int (*set_mode) (struct ata_port *ap, struct ata_device **r_failed_dev); |
| 576 | 576 | ||
| 577 | void (*post_set_mode) (struct ata_port *ap); | ||
| 578 | |||
| 579 | int (*cable_detect) (struct ata_port *ap); | 577 | int (*cable_detect) (struct ata_port *ap); |
| 580 | 578 | ||
| 581 | int (*check_atapi_dma) (struct ata_queued_cmd *qc); | 579 | int (*check_atapi_dma) (struct ata_queued_cmd *qc); |