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_pcmcia.c | |
| parent | 022e7a12b6aa11a11de4d708fe8606c9a6734b37 (diff) | |
| parent | a77c64c1a641950626181b4857abb701d8f38ccc (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/ata/pata_pcmcia.c')
| -rw-r--r-- | drivers/ata/pata_pcmcia.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ata/pata_pcmcia.c b/drivers/ata/pata_pcmcia.c index 62b25cda409b..cb501e145a42 100644 --- a/drivers/ata/pata_pcmcia.c +++ b/drivers/ata/pata_pcmcia.c | |||
| @@ -87,7 +87,7 @@ static struct ata_port_operations pcmcia_port_ops = { | |||
| 87 | 87 | ||
| 88 | .qc_prep = ata_qc_prep, | 88 | .qc_prep = ata_qc_prep, |
| 89 | .qc_issue = ata_qc_issue_prot, | 89 | .qc_issue = ata_qc_issue_prot, |
| 90 | .eng_timeout = ata_eng_timeout, | 90 | |
| 91 | .data_xfer = ata_pio_data_xfer_noirq, | 91 | .data_xfer = ata_pio_data_xfer_noirq, |
| 92 | 92 | ||
| 93 | .irq_handler = ata_interrupt, | 93 | .irq_handler = ata_interrupt, |