diff options
author | Peter Huewe <peterhuewe@gmx.de> | 2010-03-09 21:55:05 -0500 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2010-03-09 21:55:05 -0500 |
commit | 04e82ffb0f02e645f3dde5128ef39d425a8b3c6d (patch) | |
tree | ca0d7eab5c59857014186ed5c2f9b8d7fe0ce3f4 /include/linux/serial_sci.h | |
parent | 40d1f0048289b1baed859baee06878417fae540e (diff) |
serial: sh-sci: Fix build failure for non-sh architectures.
This patch fixes a build failure for various arm based defconfigs
[1][2][3] and maybe other architectures/configs.
The build failure was introduced by the sh specific patch [4]
"serial: sh-sci: Add DMA support"
by Guennadi Liakhovetski
Patch against linux-next of 20100309
References:
[1] http://kisskb.ellerman.id.au/kisskb/buildresult/2248992/
[2] http://kisskb.ellerman.id.au/kisskb/buildresult/2248996/
[3] http://kisskb.ellerman.id.au/kisskb/buildresult/2248998/
[4] http://git.kernel.org/?p=linux/kernel/git/sfr/linux-next.git;a=commit;h=73a19e4c0301908ce6346715fd08a74308451f5a
Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'include/linux/serial_sci.h')
-rw-r--r-- | include/linux/serial_sci.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/serial_sci.h b/include/linux/serial_sci.h index 1b177d29a7f0..193d4bfe42ff 100644 --- a/include/linux/serial_sci.h +++ b/include/linux/serial_sci.h | |||
@@ -2,7 +2,9 @@ | |||
2 | #define __LINUX_SERIAL_SCI_H | 2 | #define __LINUX_SERIAL_SCI_H |
3 | 3 | ||
4 | #include <linux/serial_core.h> | 4 | #include <linux/serial_core.h> |
5 | #ifdef CONFIG_SERIAL_SH_SCI_DMA | ||
5 | #include <asm/dmaengine.h> | 6 | #include <asm/dmaengine.h> |
7 | #endif | ||
6 | 8 | ||
7 | /* | 9 | /* |
8 | * Generic header for SuperH SCI(F) (used by sh/sh64/h8300 and related parts) | 10 | * Generic header for SuperH SCI(F) (used by sh/sh64/h8300 and related parts) |
@@ -30,8 +32,10 @@ struct plat_sci_port { | |||
30 | upf_t flags; /* UPF_* flags */ | 32 | upf_t flags; /* UPF_* flags */ |
31 | char *clk; /* clock string */ | 33 | char *clk; /* clock string */ |
32 | struct device *dma_dev; | 34 | struct device *dma_dev; |
35 | #ifdef CONFIG_SERIAL_SH_SCI_DMA | ||
33 | enum sh_dmae_slave_chan_id dma_slave_tx; | 36 | enum sh_dmae_slave_chan_id dma_slave_tx; |
34 | enum sh_dmae_slave_chan_id dma_slave_rx; | 37 | enum sh_dmae_slave_chan_id dma_slave_rx; |
38 | #endif | ||
35 | }; | 39 | }; |
36 | 40 | ||
37 | #endif /* __LINUX_SERIAL_SCI_H */ | 41 | #endif /* __LINUX_SERIAL_SCI_H */ |