From: Sascha Hauer <s.hauer@pengutronix.de>
Date: Thu, 4 Nov 2010 14:43:11 +0000 (+0100)
Subject: ARM i.MX: sdma is merged, so remove #ifdef SDMA_IS_MERGED
X-Git-Tag: v2.6.37-rc4~31^2~4^2~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=415d34195b3c0c26544034d37b8766dfffd36bcf;p=profile%2Fivi%2Fkernel-adaptation-intel-automotive.git

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

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---

diff --git a/arch/arm/plat-mxc/devices/platform-imx-dma.c b/arch/arm/plat-mxc/devices/platform-imx-dma.c
index 02d9890..3a705c7 100644
--- 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;