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_ali.c | |
| parent | 3f1a9aaeffd8d1cbc5ab9776c45cbd66af1c9699 (diff) | |
| parent | a77c64c1a641950626181b4857abb701d8f38ccc (diff) | |
Merge branch 'master' into gfs2
Diffstat (limited to 'drivers/ata/pata_ali.c')
| -rw-r--r-- | drivers/ata/pata_ali.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/ata/pata_ali.c b/drivers/ata/pata_ali.c index 8448ee6e0eed..87af3b5861ab 100644 --- a/drivers/ata/pata_ali.c +++ b/drivers/ata/pata_ali.c | |||
| @@ -369,7 +369,7 @@ static struct ata_port_operations ali_early_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, |
| @@ -410,7 +410,7 @@ static struct ata_port_operations ali_20_port_ops = { | |||
| 410 | 410 | ||
| 411 | .qc_prep = ata_qc_prep, | 411 | .qc_prep = ata_qc_prep, |
| 412 | .qc_issue = ata_qc_issue_prot, | 412 | .qc_issue = ata_qc_issue_prot, |
| 413 | .eng_timeout = ata_eng_timeout, | 413 | |
| 414 | .data_xfer = ata_pio_data_xfer, | 414 | .data_xfer = ata_pio_data_xfer, |
| 415 | 415 | ||
| 416 | .irq_handler = ata_interrupt, | 416 | .irq_handler = ata_interrupt, |
| @@ -448,7 +448,7 @@ static struct ata_port_operations ali_c2_port_ops = { | |||
| 448 | 448 | ||
| 449 | .qc_prep = ata_qc_prep, | 449 | .qc_prep = ata_qc_prep, |
| 450 | .qc_issue = ata_qc_issue_prot, | 450 | .qc_issue = ata_qc_issue_prot, |
| 451 | .eng_timeout = ata_eng_timeout, | 451 | |
| 452 | .data_xfer = ata_pio_data_xfer, | 452 | .data_xfer = ata_pio_data_xfer, |
| 453 | 453 | ||
| 454 | .irq_handler = ata_interrupt, | 454 | .irq_handler = ata_interrupt, |
| @@ -485,7 +485,7 @@ static struct ata_port_operations ali_c5_port_ops = { | |||
| 485 | 485 | ||
| 486 | .qc_prep = ata_qc_prep, | 486 | .qc_prep = ata_qc_prep, |
| 487 | .qc_issue = ata_qc_issue_prot, | 487 | .qc_issue = ata_qc_issue_prot, |
| 488 | .eng_timeout = ata_eng_timeout, | 488 | |
| 489 | .data_xfer = ata_pio_data_xfer, | 489 | .data_xfer = ata_pio_data_xfer, |
| 490 | 490 | ||
| 491 | .irq_handler = ata_interrupt, | 491 | .irq_handler = ata_interrupt, |