diff options
| author | <jgarzik@pretzel.yyz.us> | 2005-05-29 14:24:57 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-05-29 14:24:57 -0400 |
| commit | d582c4ea307873503a68d6d7ab72ee8599e032a9 (patch) | |
| tree | 30b5ea37ba5803fe25815d14ee248be309975cb5 /include/linux | |
| parent | 87507cfdd2cde397c9da8f6e7ec23b2b47ec53d6 (diff) | |
| parent | aa8f0dc6c3dbf1cf3ff58f3e945c981be134814d (diff) | |
Automatic merge of /spare/repo/netdev-2.6 branch use-after-unmap
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/libata.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/libata.h b/include/linux/libata.h index 1f7e2039a04e..e74f301e9bae 100644 --- a/include/linux/libata.h +++ b/include/linux/libata.h | |||
| @@ -410,6 +410,7 @@ extern u8 ata_chk_err(struct ata_port *ap); | |||
| 410 | extern void ata_exec_command(struct ata_port *ap, struct ata_taskfile *tf); | 410 | extern void ata_exec_command(struct ata_port *ap, struct ata_taskfile *tf); |
| 411 | extern int ata_port_start (struct ata_port *ap); | 411 | extern int ata_port_start (struct ata_port *ap); |
| 412 | extern void ata_port_stop (struct ata_port *ap); | 412 | extern void ata_port_stop (struct ata_port *ap); |
| 413 | extern void ata_host_stop (struct ata_host_set *host_set); | ||
| 413 | extern irqreturn_t ata_interrupt (int irq, void *dev_instance, struct pt_regs *regs); | 414 | extern irqreturn_t ata_interrupt (int irq, void *dev_instance, struct pt_regs *regs); |
| 414 | extern void ata_qc_prep(struct ata_queued_cmd *qc); | 415 | extern void ata_qc_prep(struct ata_queued_cmd *qc); |
| 415 | extern int ata_qc_issue_prot(struct ata_queued_cmd *qc); | 416 | extern int ata_qc_issue_prot(struct ata_queued_cmd *qc); |