summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-03-19 18:16:20 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-03-19 18:16:20 -0700
commite4d806377b069881f930089bf880918d3ad555ab (patch)
treeed03416ddaa770bed16880ffea32b9b71dd5c7c7 /include
parentb50df7d1fb37eb6aea87590b391d7111fde87121 (diff)
parent3f7581d66ece6b7ff643c8c817bfbd72cdbe9077 (diff)
downloadlinux-e4d806377b069881f930089bf880918d3ad555ab.tar.gz
linux-e4d806377b069881f930089bf880918d3ad555ab.tar.bz2
linux-e4d806377b069881f930089bf880918d3ad555ab.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: serial: sh-sci: remove duplicated #include sh: Export uncached helper symbols. sh: Fix up NUMA build for 29-bit. serial: sh-sci: Fix build failure for non-sh architectures. sh: Fix up uncached offset for legacy 29-bit mode. sh: Support CPU affinity masks for INTC controllers.
Diffstat (limited to 'include')
-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 1b177d29a7f0..193d4bfe42ff 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 */