diff options
| author | Tejun Heo <tj@kernel.org> | 2014-07-30 12:49:04 -0400 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2014-07-30 12:49:04 -0400 |
| commit | e8f781836dc3335b5533f6e177a105bbe3ee7345 (patch) | |
| tree | b6f05b7bf6e69bcc436ab894b7dc84c28c746d1a /drivers/ata/ahci.h | |
| parent | 19f5be0f40922717e2b6e39a9822e7e7f30fd81f (diff) | |
| parent | 1a112d10f03e83fb3a2fdc4c9165865dec8a3ca6 (diff) | |
Merge branch 'for-3.16-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata into for-3.17
The scheduled ahci platform patches depend on change in
for-3.16-fixes. Pull it into for-3.17.
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'drivers/ata/ahci.h')
| -rw-r--r-- | drivers/ata/ahci.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/ata/ahci.h b/drivers/ata/ahci.h index 7137e1bbf04a..2ed84e1c70ea 100644 --- a/drivers/ata/ahci.h +++ b/drivers/ata/ahci.h @@ -371,7 +371,9 @@ int ahci_do_softreset(struct ata_link *link, unsigned int *class, int pmp, unsigned long deadline, int (*check_ready)(struct ata_link *link)); +unsigned int ahci_qc_issue(struct ata_queued_cmd *qc); int ahci_stop_engine(struct ata_port *ap); +void ahci_start_fis_rx(struct ata_port *ap); void ahci_start_engine(struct ata_port *ap); int ahci_check_ready(struct ata_link *link); int ahci_kick_engine(struct ata_port *ap); |