Re: linux-next: manual merge of the driver-core tree with the slave-dma tree

On Thu, Nov 29, 2012 at 09:16:06AM +0530, Viresh Kumar wrote: > On 29 November 2012 09:10, Stephen Rothwell wrote: > > diff --cc drivers/dma/dw_dmac.c > > > +#ifdef CONFIG_OF > > +static struct dw_dma_platform_data * > > +__devinit dw_dma_parse_dt(struct platform_device *pdev) > > Do we need

Re: linux-next: manual merge of the driver-core tree with the slave-dma tree

On 29 November 2012 09:10, Stephen Rothwell wrote: > diff --cc drivers/dma/dw_dmac.c > +#ifdef CONFIG_OF > +static struct dw_dma_platform_data * > +__devinit dw_dma_parse_dt(struct platform_device *pdev) Do we need a separate patch to fix this place? I believe yes. > - static int __devinit d

linux-next: manual merge of the driver-core tree with the slave-dma tree

Hi Greg, Today's linux-next merge of the driver-core tree got a conflict in drivers/dma/dw_dmac.c between commit c4cabfced23f ("dmaengine: dw_dmac: Enhance device tree support") from the slave-dma tree and commit 463a1f8b3cee ("dma: remove use of __devinit") from the driver-core tree. I fixed it