diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-24 00:26:49 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-24 00:26:49 -0400 |
| commit | 98ed72deebfd2b55b7e1bb94c8175b1169999212 (patch) | |
| tree | f1682a68f65e0a38159f55a58c054779d749f8df /include/linux/libata.h | |
| parent | dbaa9a9d2b37d838125fb7f2b9fdc5dc5fa4eaa9 (diff) | |
| parent | 87e807b6c461bbd449496a4c3ab78ab164a4ba97 (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'include/linux/libata.h')
| -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 f76f54a223d2..7680b63e3456 100644 --- a/include/linux/libata.h +++ b/include/linux/libata.h | |||
| @@ -399,6 +399,7 @@ extern int ata_pci_init_one (struct pci_dev *pdev, struct ata_port_info **port_i | |||
| 399 | extern void ata_pci_remove_one (struct pci_dev *pdev); | 399 | extern void ata_pci_remove_one (struct pci_dev *pdev); |
| 400 | #endif /* CONFIG_PCI */ | 400 | #endif /* CONFIG_PCI */ |
| 401 | extern int ata_device_add(struct ata_probe_ent *ent); | 401 | extern int ata_device_add(struct ata_probe_ent *ent); |
| 402 | extern void ata_host_set_remove(struct ata_host_set *host_set); | ||
| 402 | extern int ata_scsi_detect(Scsi_Host_Template *sht); | 403 | extern int ata_scsi_detect(Scsi_Host_Template *sht); |
| 403 | extern int ata_scsi_ioctl(struct scsi_device *dev, int cmd, void __user *arg); | 404 | extern int ata_scsi_ioctl(struct scsi_device *dev, int cmd, void __user *arg); |
| 404 | extern int ata_scsi_queuecmd(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *)); | 405 | extern int ata_scsi_queuecmd(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *)); |