diff options
author | Mikael Pettersson <mikpe@it.uu.se> | 2007-02-25 06:44:39 -0500 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2007-02-25 15:41:40 -0500 |
commit | 540477b4d93f5b49f9e9ce3ae2437071103a0f8e (patch) | |
tree | 02b026be5ff4b9ca62e64d7fcc108183794518ba /drivers/ata | |
parent | fc16c25ff431d0c5b12693108f0ec3809ef1e804 (diff) |
sata_promise: fix 20619 new EH merge error
When I merged my 20619 new EH conversion with #libata-upstream
I had to manually resolve a conflict, and inadvertently lost
pdc_pata_ops' ->post_internal_cmd binding. Corrected by this patch.
Signed-off-by: Mikael Pettersson <mikpe@it.uu.se>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/ata')
-rw-r--r-- | drivers/ata/sata_promise.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/ata/sata_promise.c b/drivers/ata/sata_promise.c index cf9ed8c39301..5940bf403751 100644 --- a/drivers/ata/sata_promise.c +++ b/drivers/ata/sata_promise.c | |||
@@ -218,6 +218,7 @@ static const struct ata_port_operations pdc_pata_ops = { | |||
218 | .freeze = pdc_freeze, | 218 | .freeze = pdc_freeze, |
219 | .thaw = pdc_thaw, | 219 | .thaw = pdc_thaw, |
220 | .error_handler = pdc_error_handler, | 220 | .error_handler = pdc_error_handler, |
221 | .post_internal_cmd = pdc_post_internal_cmd, | ||
221 | .data_xfer = ata_data_xfer, | 222 | .data_xfer = ata_data_xfer, |
222 | .irq_handler = pdc_interrupt, | 223 | .irq_handler = pdc_interrupt, |
223 | .irq_clear = pdc_irq_clear, | 224 | .irq_clear = pdc_irq_clear, |