diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-09 11:35:50 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-09 11:35:50 -0500 |
| commit | 19da9b8b6ef80e4b1f870c0d270df32571fdaad6 (patch) | |
| tree | 7da3f7ff720e6543a1b1d30fe5e38b9a3c53d064 /include/linux | |
| parent | a7c243b544c0e9f6775c2607decaa59d54fb9e11 (diff) | |
| parent | 7c3983357fdaef3ae71a0d7081a4b6dcfd869d39 (diff) | |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
Diffstat (limited to 'include/linux')
| -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 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 | ||
| 400 | struct ata_port_info { | 400 | struct 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 */ |
| 434 | extern int ata_device_add(const struct ata_probe_ent *ent); | 434 | extern int ata_device_add(const struct ata_probe_ent *ent); |
| 435 | extern void ata_host_set_remove(struct ata_host_set *host_set); | 435 | extern void ata_host_set_remove(struct ata_host_set *host_set); |
| 436 | extern int ata_scsi_detect(Scsi_Host_Template *sht); | 436 | extern int ata_scsi_detect(struct scsi_host_template *sht); |
| 437 | extern int ata_scsi_ioctl(struct scsi_device *dev, int cmd, void __user *arg); | 437 | extern int ata_scsi_ioctl(struct scsi_device *dev, int cmd, void __user *arg); |
| 438 | extern int ata_scsi_queuecmd(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *)); | 438 | extern int ata_scsi_queuecmd(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *)); |
| 439 | extern int ata_scsi_error(struct Scsi_Host *host); | 439 | extern int ata_scsi_error(struct Scsi_Host *host); |