From mboxrd@z Thu Jan 1 00:00:00 1970 From: alexandre.belloni@free-electrons.com (Alexandre Belloni) Date: Mon, 27 Oct 2014 16:44:19 +0100 Subject: [PATCHv2 1/3] mmc: atmel-mci: move mache header to platform_data In-Reply-To: References: <1413534398-22645-1-git-send-email-alexandre.belloni@free-electrons.com> <1413534398-22645-2-git-send-email-alexandre.belloni@free-electrons.com> Message-ID: <20141027154419.GE22660@piout.net> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Hi, On 27/10/2014 at 16:23:23 +0100, Ulf Hansson wrote : > On 27 October 2014 15:46, Ulf Hansson wrote: > > On 17 October 2014 10:26, Alexandre Belloni > > wrote: > >> Move the mach header that can come either from arm/mach-at91 or avr32 to > >> platform_data to be able to switch the AT91 platforms to multiplatform. > >> > >> Signed-off-by: Alexandre Belloni > > > > Thanks! Applied for next! > > Actually this one caused a compiler error due to a moved header from > the below commit. > > 3d598f47e804 dmaengine: dw: move dw_dmac.h to where it belongs to > > I decided to fix it myself and fold the change into this patch, see below. > what you did seems fine. It was the same commit that conflicted with the third patch. Thanks! -- Alexandre Belloni, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com