On Sun, Aug 15, 2010 at 11:22 PM, Grant Likely
<grant.likely@xxxxxxxxxxxx> wrote:
>
>
> "Stephen Rothwell" <sfr@xxxxxxxxxxxxxxxx> wrote:
>
>>
>>Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
>
>>This patch now is needed in Linus' tree. I will add it to my fixes tree
>>for today. Linus, can you take this, please?
Linus, I'm collecting a number of OF-related fixup patches anyway, so
I'll pick this up into my tree, make sure I haven't broken anything,
and send you a pull req this afternoon.
Cheers,
g.
>>
>>diff --git a/drivers/ata/sata_dwc_460ex.c b/drivers/ata/sata_dwc_460ex.c
>>index ea24c1e..2673a3d 100644
>>--- a/drivers/ata/sata_dwc_460ex.c
>>+++ b/drivers/ata/sata_dwc_460ex.c
>>@@ -1588,7 +1588,7 @@ static const struct ata_port_info sata_dwc_port_info[] = {
>> },
>> };
>>
>>-static int sata_dwc_probe(struct of_device *ofdev,
>>+static int sata_dwc_probe(struct platform_device *ofdev,
>> const struct of_device_id *match)
>> {
>> struct sata_dwc_device *hsdev;
>>@@ -1702,7 +1702,7 @@ error_out:
>> return err;
>> }
>>
>>-static int sata_dwc_remove(struct of_device *ofdev)
>>+static int sata_dwc_remove(struct platform_device *ofdev)
>> {
>> struct device *dev = &ofdev->dev;
>> struct ata_host *host = dev_get_drvdata(dev);
>>--
>>1.7.1
>>
>>--
>>Cheers,
>>Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
>>http://www.canb.auug.org.au/~sfr/
>
> --
> Sent from my Android phone with K-9 Mail. Please excuse my brevity.
>
--
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
