From mboxrd@z Thu Jan  1 00:00:00 1970
From: u.kleine-koenig@pengutronix.de (Uwe =?iso-8859-1?Q?Kleine-K=F6nig?=)
Date: Wed, 24 Nov 2010 20:44:39 +0100
Subject: [PATCH] imx: dma: remove SDMA_IS_MERGED
In-Reply-To: <1290626971-14863-1-git-send-email-fabio.estevam@freescale.com>
References: <1290626971-14863-1-git-send-email-fabio.estevam@freescale.com>
Message-ID: <20101124194439.GY4693@pengutronix.de>
To: linux-arm-kernel@lists.infradead.org
List-Id: linux-arm-kernel.lists.infradead.org

Hello Fabio,

On Wed, Nov 24, 2010 at 05:29:31PM -0200, Fabio Estevam wrote:
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
> ---
> This allows imx-for-2.6.38 tree to build again.
The same patch is already in Sascha's imx-for-2.6.37 branch (and so in
for-next, too).  There are some more fixes in for-.37 so I'd use the
for-next branch for now.

Best regards
Uwe

-- 
Pengutronix e.K.                           | Uwe Kleine-K?nig            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |