Re: PATA driver patch for 2.6.17

From: Marcus Furlong
Date: Mon Jun 19 2006 - 17:39:57 EST


Alan Cox wrote:

> Ar Llu, 2006-06-19 am 20:46 +0100, ysgrifennodd Marcus Furlong:
>> Alan Cox wrote:
>>
>> > http://zeniv.linux.org.uk/~alan/IDE
>> >
>> > This is basically a resync versus 2.6.17, the head of the PATA tree is
>> > now built against Jeffs tree with revised error handling and the like.
>> >
>> > Alan
>>
>> I get the following bug while booting:
>
> Sorry about that. I messed up a patch segment in the merge
>
> --- drivers/scsi/ata_piix.c~ 2006-06-19 21:38:43.746144712 +0100
> +++ drivers/scsi/ata_piix.c 2006-06-19 21:38:43.747144560 +0100
> @@ -360,6 +360,8 @@
> .qc_prep = ata_qc_prep,
> .qc_issue = ata_qc_issue_prot,
>
> + .data_xfer = ata_pio_data_xfer,
> +
> .eng_timeout = ata_eng_timeout,
>
> .irq_handler = ata_interrupt,

That fixes it. Thanks! :)

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/