On Thu, Nov 29, 2012 at 09:16:06AM +0530, Viresh Kumar wrote:

On 29 November 2012 09:10, Stephen Rothwell [off-list ref] wrote:

quoted

diff --cc drivers/dma/dw_dmac.c

quoted

 +#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.

Don't worry about that for now, I'll sweep the tree after 3.8-rc1 is out
to catch stuff like this.  Otherwise the merge issues are going to be
even worse.

Or, you can fix this in the slave-dma tree if you want.

quoted

- static int __devinit dw_probe(struct platform_device *pdev)
+ static int dw_probe(struct platform_device *pdev)

Thanks for this.

Me too, thanks Stephen, and sorry for the problems this caused.

greg k-h