diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-06 08:57:15 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-06 08:57:15 -0400 |
| commit | 71ec63c5d66b577a71910b82740751be73e81310 (patch) | |
| tree | 8a3b7b4fd4068fae1b2fd7ab15e29645daa524f8 /drivers/scsi/sata_vsc.c | |
| parent | 627add2d1385394d020c84533c91ad26bc37b166 (diff) | |
| parent | 120bda20c6f64b32e8bfbdd7b34feafaa5f5332e (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/scsi/sata_vsc.c')
| -rw-r--r-- | drivers/scsi/sata_vsc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/sata_vsc.c b/drivers/scsi/sata_vsc.c index 916fe6fba756..ad37871594f5 100644 --- a/drivers/scsi/sata_vsc.c +++ b/drivers/scsi/sata_vsc.c | |||
| @@ -297,7 +297,7 @@ static const struct ata_port_operations vsc_sata_ops = { | |||
| 297 | .bmdma_status = ata_bmdma_status, | 297 | .bmdma_status = ata_bmdma_status, |
| 298 | .qc_prep = ata_qc_prep, | 298 | .qc_prep = ata_qc_prep, |
| 299 | .qc_issue = ata_qc_issue_prot, | 299 | .qc_issue = ata_qc_issue_prot, |
| 300 | .data_xfer = ata_pio_data_xfer, | 300 | .data_xfer = ata_mmio_data_xfer, |
| 301 | .freeze = ata_bmdma_freeze, | 301 | .freeze = ata_bmdma_freeze, |
| 302 | .thaw = ata_bmdma_thaw, | 302 | .thaw = ata_bmdma_thaw, |
| 303 | .error_handler = ata_bmdma_error_handler, | 303 | .error_handler = ata_bmdma_error_handler, |