ARM i.MX: sdma is merged, so remove #ifdef SDMA_IS_MERGED
authorSascha Hauer <s.hauer@pengutronix.de>
Thu, 4 Nov 2010 14:43:11 +0000 (15:43 +0100)
committerSascha Hauer <s.hauer@pengutronix.de>
Mon, 15 Nov 2010 08:25:02 +0000 (09:25 +0100)
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
arch/arm/plat-mxc/devices/platform-imx-dma.c

index 02d989018059361c84077f1b80d49aba6d65b38b..3a705c7877dd1040121d6abd17a251c105259715 100644 (file)
 
 #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;