From: fabio.estevam@freescale.com (Fabio Estevam)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] imx: dma: remove SDMA_IS_MERGED
Date: Wed, 24 Nov 2010 17:29:31 -0200 [thread overview]
Message-ID: <1290626971-14863-1-git-send-email-fabio.estevam@freescale.com> (raw)
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
This allows imx-for-2.6.38 tree to build again.
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 93e2fdc..89ec637 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;
--
1.6.0.4
next reply other threads:[~2010-11-24 19:29 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-11-24 19:29 Fabio Estevam [this message]
2010-11-24 19:44 ` [PATCH] imx: dma: remove SDMA_IS_MERGED Uwe Kleine-König
2010-11-24 20:07 ` Fabio Estevam
2010-11-24 20:18 ` Uwe Kleine-König
2010-11-24 21:42 ` Fabio Estevam
2010-11-24 21:58 ` Uwe Kleine-König
2010-11-24 22:57 ` Richard Zhao
2010-11-25 9:13 ` Sascha Hauer
2010-11-25 12:09 ` Fabio Estevam
2010-11-25 12:29 ` Arnaud Patard (Rtp)
2010-11-25 12:32 ` Fabio Estevam
2010-11-25 13:58 ` Uwe Kleine-König
2010-11-29 21:24 ` Sascha Hauer
2010-11-29 22:27 ` Fabio Estevam
2010-12-01 11:14 ` Sascha Hauer
2010-12-01 11:35 ` Arnaud Patard (Rtp)
2010-12-01 15:41 ` Sascha Hauer
2010-12-01 23:44 ` Arnaud Patard (Rtp)
2010-12-02 12:14 ` Sascha Hauer
2010-12-02 15:36 ` Fabio Estevam
2010-12-01 15:40 ` Fabio Estevam
2010-12-03 13:00 ` Arnaud Patard (Rtp)
2010-12-03 19:49 ` Fabio Estevam
2010-11-25 9:07 ` Sascha Hauer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1290626971-14863-1-git-send-email-fabio.estevam@freescale.com \
--to=fabio.estevam@freescale.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).