diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-27 18:13:53 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-27 18:13:53 -0400 |
| commit | aebb1153ac54ddbbd3d3f0481a193f4bf0ead53b (patch) | |
| tree | 57425aa83c8bed5b41af7e3408024fe1f2fdded9 /drivers/ata/pata_cs5530.c | |
| parent | 022e7a12b6aa11a11de4d708fe8606c9a6734b37 (diff) | |
| parent | a77c64c1a641950626181b4857abb701d8f38ccc (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/ata/pata_cs5530.c')
| -rw-r--r-- | drivers/ata/pata_cs5530.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ata/pata_cs5530.c b/drivers/ata/pata_cs5530.c index f3d8a3bc1e78..7bba4d954e9c 100644 --- a/drivers/ata/pata_cs5530.c +++ b/drivers/ata/pata_cs5530.c | |||
| @@ -207,7 +207,7 @@ static struct ata_port_operations cs5530_port_ops = { | |||
| 207 | 207 | ||
| 208 | .qc_prep = ata_qc_prep, | 208 | .qc_prep = ata_qc_prep, |
| 209 | .qc_issue = cs5530_qc_issue_prot, | 209 | .qc_issue = cs5530_qc_issue_prot, |
| 210 | .eng_timeout = ata_eng_timeout, | 210 | |
| 211 | .data_xfer = ata_pio_data_xfer, | 211 | .data_xfer = ata_pio_data_xfer, |
| 212 | 212 | ||
| 213 | .irq_handler = ata_interrupt, | 213 | .irq_handler = ata_interrupt, |