aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-11-07 00:59:37 -0500
committerJeff Garzik <jgarzik@pobox.com>2005-11-07 00:59:37 -0500
commit193515d51ccb363165d6b09e9ba5c21089e34bad (patch)
tree9eec151ee1c2091640862adf79f99eca024a98f1 /include
parent0b154bb7d0cce80e9c0bcf11d4f9e71b59409d26 (diff)
[libata] eliminate use of drivers/scsi/scsi.h compatibility header/defines
Diffstat (limited to 'include')
-rw-r--r--include/linux/libata.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/libata.h b/include/linux/libata.h
index dcd17e7458ab..6f0752219f64 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -214,7 +214,7 @@ struct ata_probe_ent {
214 struct list_head node; 214 struct list_head node;
215 struct device *dev; 215 struct device *dev;
216 const struct ata_port_operations *port_ops; 216 const struct ata_port_operations *port_ops;
217 Scsi_Host_Template *sht; 217 struct scsi_host_template *sht;
218 struct ata_ioports port[ATA_MAX_PORTS]; 218 struct ata_ioports port[ATA_MAX_PORTS];
219 unsigned int n_ports; 219 unsigned int n_ports;
220 unsigned int hard_port_no; 220 unsigned int hard_port_no;
@@ -398,7 +398,7 @@ struct ata_port_operations {
398}; 398};
399 399
400struct ata_port_info { 400struct ata_port_info {
401 Scsi_Host_Template *sht; 401 struct scsi_host_template *sht;
402 unsigned long host_flags; 402 unsigned long host_flags;
403 unsigned long pio_mask; 403 unsigned long pio_mask;
404 unsigned long mwdma_mask; 404 unsigned long mwdma_mask;
@@ -433,7 +433,7 @@ extern void ata_pci_remove_one (struct pci_dev *pdev);
433#endif /* CONFIG_PCI */ 433#endif /* CONFIG_PCI */
434extern int ata_device_add(const struct ata_probe_ent *ent); 434extern int ata_device_add(const struct ata_probe_ent *ent);
435extern void ata_host_set_remove(struct ata_host_set *host_set); 435extern void ata_host_set_remove(struct ata_host_set *host_set);
436extern int ata_scsi_detect(Scsi_Host_Template *sht); 436extern int ata_scsi_detect(struct scsi_host_template *sht);
437extern int ata_scsi_ioctl(struct scsi_device *dev, int cmd, void __user *arg); 437extern int ata_scsi_ioctl(struct scsi_device *dev, int cmd, void __user *arg);
438extern int ata_scsi_queuecmd(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *)); 438extern int ata_scsi_queuecmd(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *));
439extern int ata_scsi_error(struct Scsi_Host *host); 439extern int ata_scsi_error(struct Scsi_Host *host);