diff options
| author | Mikael Pettersson <mikpe@it.uu.se> | 2007-02-25 12:44:39 +0100 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-02-25 15:41:40 -0500 |
| commit | 540477b4d93f5b49f9e9ce3ae2437071103a0f8e (patch) | |
| tree | 02b026be5ff4b9ca62e64d7fcc108183794518ba /drivers/ata/sata_promise.c | |
| parent | fc16c25ff431d0c5b12693108f0ec3809ef1e804 (diff) | |
| download | lwn-540477b4d93f5b49f9e9ce3ae2437071103a0f8e.tar.gz lwn-540477b4d93f5b49f9e9ce3ae2437071103a0f8e.zip | |
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/sata_promise.c')
| -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 = { .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, |