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

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2010-11-04 15:43:11 +01:00 · 2010-11-04 15:43:11 +01:00 · 415d34195b
parent 1b346af2f8
commit 415d34195b
1 changed files with 0 additions and 8 deletions
--- a/arch/arm/plat-mxc/devices/platform-imx-dma.c
+++ b/arch/arm/plat-mxc/devices/platform-imx-dma.c
@ -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;