diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-02-20 05:13:31 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-20 05:13:31 -0500 |
| commit | ff607748590fba14aecedb0d50edc4ada98d4302 (patch) | |
| tree | 986e0a3abe922713069a8e8bc913043fed89a39a /include/linux/libata.h | |
| parent | db024d5398cd332023896caf70530564b15ec88e (diff) | |
| parent | 6aff8f1f07a7fff48121d1ad4a550f3af24ccc81 (diff) | |
| download | kernel-crypto-ff607748590fba14aecedb0d50edc4ada98d4302.tar.gz kernel-crypto-ff607748590fba14aecedb0d50edc4ada98d4302.tar.xz kernel-crypto-ff607748590fba14aecedb0d50edc4ada98d4302.zip | |
Merge branch 'upstream'
Diffstat (limited to 'include/linux/libata.h')
| -rw-r--r-- | include/linux/libata.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/libata.h b/include/linux/libata.h index 67d07c44b2e..63500881acc 100644 --- a/include/linux/libata.h +++ b/include/linux/libata.h @@ -541,10 +541,10 @@ extern void ata_sg_init_one(struct ata_queued_cmd *qc, void *buf, extern void ata_sg_init(struct ata_queued_cmd *qc, struct scatterlist *sg, unsigned int n_elem); extern unsigned int ata_dev_classify(const struct ata_taskfile *tf); -extern void ata_dev_id_string(const u16 *id, unsigned char *s, - unsigned int ofs, unsigned int len); -extern void ata_dev_id_c_string(const u16 *id, unsigned char *s, - unsigned int ofs, unsigned int len); +extern void ata_id_string(const u16 *id, unsigned char *s, + unsigned int ofs, unsigned int len); +extern void ata_id_c_string(const u16 *id, unsigned char *s, + unsigned int ofs, unsigned int len); extern void ata_dev_config(struct ata_port *ap, unsigned int i); extern void ata_bmdma_setup (struct ata_queued_cmd *qc); extern void ata_bmdma_start (struct ata_queued_cmd *qc); |