summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Huewe <peterhuewe@gmx.de>2010-03-10 11:55:05 +0900
committerPaul Mundt <lethal@linux-sh.org>2010-03-10 11:55:05 +0900
commit04e82ffb0f02e645f3dde5128ef39d425a8b3c6d (patch)
treeca0d7eab5c59857014186ed5c2f9b8d7fe0ce3f4
parent40d1f0048289b1baed859baee06878417fae540e (diff)
downloadop-kernel-dev-04e82ffb0f02e645f3dde5128ef39d425a8b3c6d.zip
op-kernel-dev-04e82ffb0f02e645f3dde5128ef39d425a8b3c6d.tar.gz
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>
-rw-r--r--include/linux/serial_sci.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/serial_sci.h b/include/linux/serial_sci.h
index 1b177d29..193d4bf 100644
--- a/include/linux/serial_sci.h
+++ b/include/linux/serial_sci.h
@@ -2,7 +2,9 @@
#define __LINUX_SERIAL_SCI_H
#include <linux/serial_core.h>
+#ifdef CONFIG_SERIAL_SH_SCI_DMA
#include <asm/dmaengine.h>
+#endif
/*
* Generic header for SuperH SCI(F) (used by sh/sh64/h8300 and related parts)
@@ -30,8 +32,10 @@ struct plat_sci_port {
upf_t flags; /* UPF_* flags */
char *clk; /* clock string */
struct device *dma_dev;
+#ifdef CONFIG_SERIAL_SH_SCI_DMA
enum sh_dmae_slave_chan_id dma_slave_tx;
enum sh_dmae_slave_chan_id dma_slave_rx;
+#endif
};
#endif /* __LINUX_SERIAL_SCI_H */
OpenPOWER on IntegriCloud