From: Mikael Pettersson Date: Sun, 25 Feb 2007 11:44:39 +0000 (+0100) Subject: sata_promise: fix 20619 new EH merge error X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=540477b4d93f5b49f9e9ce3ae2437071103a0f8e;p=openwrt%2Fstaging%2Fblogic.git 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 Signed-off-by: Jeff Garzik --- 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 = { .freeze = pdc_freeze, .thaw = pdc_thaw, .error_handler = pdc_error_handler, + .post_internal_cmd = pdc_post_internal_cmd, .data_xfer = ata_data_xfer, .irq_handler = pdc_interrupt, .irq_clear = pdc_irq_clear,