lkml.org 
[lkml]   [2011]   [Dec]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH v2 1/2] dma/ep93xx_dma: fix initialization of M2M control register
On Mon, Dec 05, 2011 at 08:18:29AM +0530, Vinod Koul wrote:
> On Sat, 2011-11-26 at 12:54 +0200, Mika Westerberg wrote:
> > From: Rafal Prylowski <prylowski@metasoft.pl>
> >
> > Setting the flags in case of IDE didn't have any effect since the control
> > register is overwritten few lines below. So move these to be after the control
> > register is initialized.
> >
> > Signed-off-by: Rafal Prylowski <prylowski@metasoft.pl>
> > Signed-off-by: Mika Westerberg <mika.westerberg@iki.fi>
> > Acked-by: H Hartley Sweeten <hsweeten@visionengravers.com>
> Applied both, Thanks
>
> I got a trivial merge conflict on both patches as I think these patches
> were of made on top of dma_slave_direction changes we did sometime back.
>
> So please do check if merges were right...

Looks right to me. Thanks.


\
 
 \ /
  Last update: 2011-12-06 13:01    [from the cache]
©2003-2014 Jasper Spaans. Advertise on this site