diff options
| author | Jeff Garzik <jgarzik@redhat.com> | 2004-03-18 07:30:00 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@redhat.com> | 2004-03-18 07:30:00 -0500 |
| commit | 3b0598164127d40f05426d826096e7614a8edcbf (patch) | |
| tree | bce6f242185d94058ec1f0c237033e606ceae79f /include/linux | |
| parent | dc5178fa645b77079964356ab2dc6e12b24294d4 (diff) | |
| parent | 4f4a9689654e71d10bce2d6e1615a96954d8c75e (diff) | |
Merge redhat.com:/spare/repo/linux-2.6
into redhat.com:/spare/repo/libata-2.6
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/libata.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/libata.h b/include/linux/libata.h index 0d10e7df6771..3a1cb04caec7 100644 --- a/include/linux/libata.h +++ b/include/linux/libata.h @@ -362,7 +362,7 @@ struct ata_port_operations { u8 (*check_status)(struct ata_port *ap); void (*phy_reset) (struct ata_port *ap); - void (*phy_config) (struct ata_port *ap); + void (*post_set_mode) (struct ata_port *ap); void (*bmdma_start) (struct ata_queued_cmd *qc); void (*fill_sg) (struct ata_queued_cmd *qc); @@ -396,7 +396,6 @@ struct pci_bits { }; extern void ata_port_probe(struct ata_port *); -extern void pata_phy_config(struct ata_port *ap); extern void sata_phy_reset(struct ata_port *ap); extern void ata_bus_reset(struct ata_port *ap); extern void ata_port_disable(struct ata_port *); |