diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-28 08:29:59 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-28 08:29:59 -0400 |
| commit | 185a257f2f73bcd89050ad02da5bedbc28fc43fa (patch) | |
| tree | 5e32586114534ed3f2165614cba3d578f5d87307 /drivers/ata/pata_cmd64x.c | |
| parent | 3f1a9aaeffd8d1cbc5ab9776c45cbd66af1c9699 (diff) | |
| parent | a77c64c1a641950626181b4857abb701d8f38ccc (diff) | |
Merge branch 'master' into gfs2
Diffstat (limited to 'drivers/ata/pata_cmd64x.c')
| -rw-r--r-- | drivers/ata/pata_cmd64x.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ata/pata_cmd64x.c b/drivers/ata/pata_cmd64x.c index abf1bb7bd322..e92b0ef43ec5 100644 --- a/drivers/ata/pata_cmd64x.c +++ b/drivers/ata/pata_cmd64x.c | |||
| @@ -301,7 +301,7 @@ static struct ata_port_operations cmd64x_port_ops = { | |||
| 301 | 301 | ||
| 302 | .qc_prep = ata_qc_prep, | 302 | .qc_prep = ata_qc_prep, |
| 303 | .qc_issue = ata_qc_issue_prot, | 303 | .qc_issue = ata_qc_issue_prot, |
| 304 | .eng_timeout = ata_eng_timeout, | 304 | |
| 305 | .data_xfer = ata_pio_data_xfer, | 305 | .data_xfer = ata_pio_data_xfer, |
| 306 | 306 | ||
| 307 | .irq_handler = ata_interrupt, | 307 | .irq_handler = ata_interrupt, |
| @@ -335,7 +335,7 @@ static struct ata_port_operations cmd646r1_port_ops = { | |||
| 335 | 335 | ||
| 336 | .qc_prep = ata_qc_prep, | 336 | .qc_prep = ata_qc_prep, |
| 337 | .qc_issue = ata_qc_issue_prot, | 337 | .qc_issue = ata_qc_issue_prot, |
| 338 | .eng_timeout = ata_eng_timeout, | 338 | |
| 339 | .data_xfer = ata_pio_data_xfer, | 339 | .data_xfer = ata_pio_data_xfer, |
| 340 | 340 | ||
| 341 | .irq_handler = ata_interrupt, | 341 | .irq_handler = ata_interrupt, |
| @@ -369,7 +369,7 @@ static struct ata_port_operations cmd648_port_ops = { | |||
| 369 | 369 | ||
| 370 | .qc_prep = ata_qc_prep, | 370 | .qc_prep = ata_qc_prep, |
| 371 | .qc_issue = ata_qc_issue_prot, | 371 | .qc_issue = ata_qc_issue_prot, |
| 372 | .eng_timeout = ata_eng_timeout, | 372 | |
| 373 | .data_xfer = ata_pio_data_xfer, | 373 | .data_xfer = ata_pio_data_xfer, |
| 374 | 374 | ||
| 375 | .irq_handler = ata_interrupt, | 375 | .irq_handler = ata_interrupt, |