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_hpt3x2n.c | |
| parent | 022e7a12b6aa11a11de4d708fe8606c9a6734b37 (diff) | |
| parent | a77c64c1a641950626181b4857abb701d8f38ccc (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/ata/pata_hpt3x2n.c')
| -rw-r--r-- | drivers/ata/pata_hpt3x2n.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ata/pata_hpt3x2n.c b/drivers/ata/pata_hpt3x2n.c index 06c8db079b91..5c5d4f6ab901 100644 --- a/drivers/ata/pata_hpt3x2n.c +++ b/drivers/ata/pata_hpt3x2n.c | |||
| @@ -372,7 +372,7 @@ static struct ata_port_operations hpt3x2n_port_ops = { | |||
| 372 | 372 | ||
| 373 | .qc_prep = ata_qc_prep, | 373 | .qc_prep = ata_qc_prep, |
| 374 | .qc_issue = hpt3x2n_qc_issue_prot, | 374 | .qc_issue = hpt3x2n_qc_issue_prot, |
| 375 | .eng_timeout = ata_eng_timeout, | 375 | |
| 376 | .data_xfer = ata_pio_data_xfer, | 376 | .data_xfer = ata_pio_data_xfer, |
| 377 | 377 | ||
| 378 | .irq_handler = ata_interrupt, | 378 | .irq_handler = ata_interrupt, |