diff options
| author | Guennadi Liakhovetski <g.liakhovetski@gmx.de> | 2012-07-30 23:28:47 +0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2012-08-01 08:48:54 +0400 |
| commit | 4dc4c51675c137c30838425ecc8d471ff5eb138b (patch) | |
| tree | f6756522266928cc74be1c55ec9453b0a007b082 /drivers/tty/serial/sh-sci.c | |
| parent | 4f46f8ac80416b0e8fd3aba6a0d842205fb29140 (diff) | |
| download | linux-4dc4c51675c137c30838425ecc8d471ff5eb138b.tar.xz | |
serial: sh-sci: fix compilation breakage, when DMA is enabled
A recent commit:
commit d6fa5a4e7ab605370fd6c982782f84ef2e6660e7
Author: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
serial: sh-sci: prepare for conversion to the shdma base library
is not sufficient to update the sh-sci driver to the new shdma driver
layout. This caused compilation breakage, when CONFIG_SERIAL_SH_SCI_DMA
is enabled. This patch trivially fixes the problem by updating the DMA
descriptor manipulation code.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'drivers/tty/serial/sh-sci.c')
| -rw-r--r-- | drivers/tty/serial/sh-sci.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c index d4d8c9453cd8..9be296cf7295 100644 --- a/drivers/tty/serial/sh-sci.c +++ b/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; |