aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/libata.h
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-03-24 09:24:04 -0500
committerJeff Garzik <jeff@garzik.org>2006-03-24 09:24:04 -0500
commit11ed56fb7899f9eb9eaef8e5919db1bf08f1b07e (patch)
treeb01421cb139b11065d776ed361a7a12b3a1aecc9 /include/linux/libata.h
parent54da9a3968448681d0ddf193ec90f2480c5cba1c (diff)
parent2cc432eed0491df66e14b578139bba2c75fb3f9a (diff)
Merge branch 'upstream'
Conflicts: drivers/scsi/sata_vsc.c
Diffstat (limited to 'include/linux/libata.h')
-rw-r--r--include/linux/libata.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/libata.h b/include/linux/libata.h
index d051a823758b..b3d4c906e242 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -507,13 +507,13 @@ extern int ata_pci_init_one (struct pci_dev *pdev, struct ata_port_info **port_i
507extern void ata_pci_remove_one (struct pci_dev *pdev); 507extern void ata_pci_remove_one (struct pci_dev *pdev);
508extern int ata_pci_device_suspend(struct pci_dev *pdev, pm_message_t state); 508extern int ata_pci_device_suspend(struct pci_dev *pdev, pm_message_t state);
509extern int ata_pci_device_resume(struct pci_dev *pdev); 509extern int ata_pci_device_resume(struct pci_dev *pdev);
510extern int ata_pci_clear_simplex(struct pci_dev *pdev);
510#endif /* CONFIG_PCI */ 511#endif /* CONFIG_PCI */
511extern int ata_device_add(const struct ata_probe_ent *ent); 512extern int ata_device_add(const struct ata_probe_ent *ent);
512extern void ata_host_set_remove(struct ata_host_set *host_set); 513extern void ata_host_set_remove(struct ata_host_set *host_set);
513extern int ata_scsi_detect(struct scsi_host_template *sht); 514extern int ata_scsi_detect(struct scsi_host_template *sht);
514extern int ata_scsi_ioctl(struct scsi_device *dev, int cmd, void __user *arg); 515extern int ata_scsi_ioctl(struct scsi_device *dev, int cmd, void __user *arg);
515extern int ata_scsi_queuecmd(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *)); 516extern int ata_scsi_queuecmd(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *));
516extern enum scsi_eh_timer_return ata_scsi_timed_out(struct scsi_cmnd *cmd);
517extern int ata_scsi_error(struct Scsi_Host *host); 517extern int ata_scsi_error(struct Scsi_Host *host);
518extern void ata_eh_qc_complete(struct ata_queued_cmd *qc); 518extern void ata_eh_qc_complete(struct ata_queued_cmd *qc);
519extern void ata_eh_qc_retry(struct ata_queued_cmd *qc); 519extern void ata_eh_qc_retry(struct ata_queued_cmd *qc);
@@ -548,6 +548,7 @@ extern void ata_port_stop (struct ata_port *ap);
548extern void ata_host_stop (struct ata_host_set *host_set); 548extern void ata_host_stop (struct ata_host_set *host_set);
549extern irqreturn_t ata_interrupt (int irq, void *dev_instance, struct pt_regs *regs); 549extern irqreturn_t ata_interrupt (int irq, void *dev_instance, struct pt_regs *regs);
550extern void ata_qc_prep(struct ata_queued_cmd *qc); 550extern void ata_qc_prep(struct ata_queued_cmd *qc);
551extern void ata_noop_qc_prep(struct ata_queued_cmd *qc);
551extern unsigned int ata_qc_issue_prot(struct ata_queued_cmd *qc); 552extern unsigned int ata_qc_issue_prot(struct ata_queued_cmd *qc);
552extern void ata_sg_init_one(struct ata_queued_cmd *qc, void *buf, 553extern void ata_sg_init_one(struct ata_queued_cmd *qc, void *buf,
553 unsigned int buflen); 554 unsigned int buflen);
@@ -614,7 +615,7 @@ extern void ata_pci_host_stop (struct ata_host_set *host_set);
614extern struct ata_probe_ent * 615extern struct ata_probe_ent *
615ata_pci_init_native_mode(struct pci_dev *pdev, struct ata_port_info **port, int portmask); 616ata_pci_init_native_mode(struct pci_dev *pdev, struct ata_port_info **port, int portmask);
616extern int pci_test_config_bits(struct pci_dev *pdev, const struct pci_bits *bits); 617extern int pci_test_config_bits(struct pci_dev *pdev, const struct pci_bits *bits);
617 618extern unsigned long ata_pci_default_filter(const struct ata_port *, struct ata_device *, unsigned long);
618#endif /* CONFIG_PCI */ 619#endif /* CONFIG_PCI */
619 620
620 621