diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-03-18 22:24:27 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-03-18 22:24:27 -0800 |
| commit | 7bcba5b04e572f79de4d218a67066f4e08985d2a (patch) | |
| tree | f8d9b823f5d8ccde822eef3f92908d78e671b52d /include/linux | |
| parent | f6c5dcb15bf74b4efc76efe5539025e8c74c2ea9 (diff) | |
| parent | cfa0250dc9e27b0e96b12249facb988f089f626f (diff) | |
Merge bk://gkernel.bkbits.net/libata-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux
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 *); |