Thanks Stephen. I'll drop the offending hunk from my tree.
g.
On Tue, Sep 20, 2011 at 9:34 PM, Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> Hi Grant,
>
> Today's linux-next merge of the spi tree got a conflict in
> drivers/spi/spi-pl022.c between commit 67fc8b9fe70c ("PM: add runtime PM
> support to core Primecell driver") from the arm tree and commit
> 4eb389a89154 ("spi/spi-pl022: Resolve formatting issues") from the spi
> tree.
>
> The former removes the lines modified by the latter, so I just removed
> the lines (see below).
> --
> Cheers,
> Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
>
> diff --cc drivers/spi/spi-pl022.c
> index 3520cf9,02b2eda..0000000
> --- a/drivers/spi/spi-pl022.c
> +++ b/drivers/spi/spi-pl022.c
> @@@ -2235,8 -2237,11 +2225,10 @@@ pl022_probe(struct amba_device *adev, c
> err_start_queue:
> err_init_queue:
> destroy_queue(pl022);
> - pl022_dma_remove(pl022);
> + if (platform_info->enable_dma)
> + pl022_dma_remove(pl022);
> +
> free_irq(adev->irq[0], pl022);
> - pm_runtime_disable(&adev->dev);
> err_no_irq:
> clk_put(pl022->clk);
> err_no_clk:
> @@@ -2429,9 -2404,10 +2422,8 @@@ static struct amba_driver pl022_driver
> .id_table = pl022_ids,
> .probe = pl022_probe,
> .remove = __devexit_p(pl022_remove),
> - .suspend = pl022_suspend,
> - .resume = pl022_resume,
> };
>
> -
> static int __init pl022_init(void)
> {
> return amba_driver_register(&pl022_driver);
>
--
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
