diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-09 08:35:50 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-09 08:35:50 -0800 |
| commit | 19da9b8b6ef80e4b1f870c0d270df32571fdaad6 (patch) | |
| tree | 7da3f7ff720e6543a1b1d30fe5e38b9a3c53d064 /include | |
| parent | a7c243b544c0e9f6775c2607decaa59d54fb9e11 (diff) | |
| parent | 7c3983357fdaef3ae71a0d7081a4b6dcfd869d39 (diff) | |
| download | linux-3.10-19da9b8b6ef80e4b1f870c0d270df32571fdaad6.tar.gz linux-3.10-19da9b8b6ef80e4b1f870c0d270df32571fdaad6.tar.bz2 linux-3.10-19da9b8b6ef80e4b1f870c0d270df32571fdaad6.zip | |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/libata.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/libata.h b/include/linux/libata.h index dcd17e7458a..6f0752219f6 100644 --- a/include/linux/libata.h +++ b/include/linux/libata.h @@ -214,7 +214,7 @@ struct ata_probe_ent { struct list_head node; struct device *dev; const struct ata_port_operations *port_ops; - Scsi_Host_Template *sht; + struct scsi_host_template *sht; struct ata_ioports port[ATA_MAX_PORTS]; unsigned int n_ports; unsigned int hard_port_no; @@ -398,7 +398,7 @@ struct ata_port_operations { }; struct ata_port_info { - Scsi_Host_Template *sht; + struct scsi_host_template *sht; unsigned long host_flags; unsigned long pio_mask; unsigned long mwdma_mask; @@ -433,7 +433,7 @@ extern void ata_pci_remove_one (struct pci_dev *pdev); #endif /* CONFIG_PCI */ extern int ata_device_add(const struct ata_probe_ent *ent); extern void ata_host_set_remove(struct ata_host_set *host_set); -extern int ata_scsi_detect(Scsi_Host_Template *sht); +extern int ata_scsi_detect(struct scsi_host_template *sht); extern int ata_scsi_ioctl(struct scsi_device *dev, int cmd, void __user *arg); extern int ata_scsi_queuecmd(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *)); extern int ata_scsi_error(struct Scsi_Host *host); |