diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2010-11-04 15:43:11 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2010-11-15 09:25:02 +0100 |
| commit | 415d34195b3c0c26544034d37b8766dfffd36bcf (patch) | |
| tree | 0d9ae66694811e8ad94ee4f869122bf553cfff80 /arch | |
| parent | 1b346af2f88a0e19e718a843d39d34e41e5527e1 (diff) | |
| download | linux-stable-415d34195b3c0c26544034d37b8766dfffd36bcf.tar.gz linux-stable-415d34195b3c0c26544034d37b8766dfffd36bcf.tar.bz2 linux-stable-415d34195b3c0c26544034d37b8766dfffd36bcf.zip | |
ARM i.MX: sdma is merged, so remove #ifdef SDMA_IS_MERGED
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/plat-mxc/devices/platform-imx-dma.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/arm/plat-mxc/devices/platform-imx-dma.c b/arch/arm/plat-mxc/devices/platform-imx-dma.c index 02d989018059..3a705c7877dd 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; |