summaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-03-28 13:52:37 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-03-28 13:52:37 -0800
commitd4965b3e2ff94d0c7b7e6e7e9794b54950a2f4b9 (patch)
treee96e7a3e02acacd4ee200592ec176b94802d11e7 /include/linux
parent9561b03dc360068504cb296d325fb84295f91fbb (diff)
parentaee85fe8e8143d3f54d9e6d3c6cdd40ead563267 (diff)
Merge master.kernel.org:/home/rmk/linux-2.6-serial
* master.kernel.org:/home/rmk/linux-2.6-serial: [SERIAL] Provide Cirrus EP93xx AMBA PL010 serial support. [SERIAL] amba-pl010: allow platforms to specify modem control method [SERIAL] Remove obsoleted au1x00_uart driver [SERIAL] Small time UART configuration fix for AU1100 processor
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/amba/serial.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/amba/serial.h b/include/linux/amba/serial.h
index dc726ffcceb..48ee32a18ac 100644
--- a/include/linux/amba/serial.h
+++ b/include/linux/amba/serial.h
@@ -158,4 +158,10 @@
#define UART01x_RSR_ANY (UART01x_RSR_OE|UART01x_RSR_BE|UART01x_RSR_PE|UART01x_RSR_FE)
#define UART01x_FR_MODEM_ANY (UART01x_FR_DCD|UART01x_FR_DSR|UART01x_FR_CTS)
+#ifndef __ASSEMBLY__
+struct amba_pl010_data {
+ void (*set_mctrl)(struct amba_device *dev, void __iomem *base, unsigned int mctrl);
+};
+#endif
+
#endif