From d52cd4cc866c405e6eb41e958075ed316b39be9f Mon Sep 17 00:00:00 2001
From: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Date: Mon, 30 Jul 2012 21:28:47 +0200
Subject: [PATCH] --- yaml --- r: 321236 b: refs/heads/master c:
 4dc4c51675c137c30838425ecc8d471ff5eb138b h: refs/heads/master v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/tty/serial/sh-sci.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 2446d91127b7..d6d5a1aeca7b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4f46f8ac80416b0e8fd3aba6a0d842205fb29140
+refs/heads/master: 4dc4c51675c137c30838425ecc8d471ff5eb138b
diff --git a/trunk/drivers/tty/serial/sh-sci.c b/trunk/drivers/tty/serial/sh-sci.c
index d4d8c9453cd8..9be296cf7295 100644
--- a/trunk/drivers/tty/serial/sh-sci.c
+++ b/trunk/drivers/tty/serial/sh-sci.c
@@ -25,6 +25,7 @@
 
 #include <linux/module.h>
 #include <linux/errno.h>
+#include <linux/sh_dma.h>
 #include <linux/timer.h>
 #include <linux/interrupt.h>
 #include <linux/tty.h>
@@ -1410,8 +1411,8 @@ static void work_fn_rx(struct work_struct *work)
 		/* Handle incomplete DMA receive */
 		struct tty_struct *tty = port->state->port.tty;
 		struct dma_chan *chan = s->chan_rx;
-		struct sh_desc *sh_desc = container_of(desc, struct sh_desc,
-						       async_tx);
+		struct shdma_desc *sh_desc = container_of(desc,
+					struct shdma_desc, async_tx);
 		unsigned long flags;
 		int count;