]> err.no Git - linux-2.6/commitdiff
sata_promise: fix 20619 new EH merge error
authorMikael Pettersson <mikpe@it.uu.se>
Sun, 25 Feb 2007 11:44:39 +0000 (12:44 +0100)
committerJeff Garzik <jeff@garzik.org>
Sun, 25 Feb 2007 20:41:40 +0000 (15:41 -0500)
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>
drivers/ata/sata_promise.c

index cf9ed8c3930155bf87cd0d08c63c1ee84d977539..5940bf403751ff9ef1c247c862434cac27fc9cb7 100644 (file)
@@ -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,