Commit 415d3419 authored by Sascha Hauer's avatar Sascha Hauer
Browse files

ARM i.MX: sdma is merged, so remove #ifdef SDMA_IS_MERGED 



Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
parent 1b346af2

arch/arm/plat-mxc/devices/platform-imx-dma.c

+0 −8
Original line number Diff line number Diff line
@@ -12,15 +12,7 @@ 


#include <mach/hardware.h>

#include <mach/devices-common.h>

#ifdef SDMA_IS_MERGED

#include <mach/sdma.h>

#else

struct sdma_platform_data {

	int sdma_version;

	char *cpu_name;

	int to_version;

};

#endif



struct imx_imx_sdma_data {

	resource_size_t iobase;