Merge tag 'v3.7-rc3' into next to sync up with recent USB and MFD changes

1 files changed, 22 insertions, 0 deletions

diff --git a/include/uapi/linux/termios.h b/include/uapi/linux/termios.h
new file mode 100644
index 000000000000..2acd0c1f8a2a
--- /dev/null
+++ b/include/uapi/linux/termios.h
@@ -0,0 +1,22 @@
+#ifndef _LINUX_TERMIOS_H
+#define _LINUX_TERMIOS_H
+
+#include <linux/types.h>
+#include <asm/termios.h>
+
+#define NFF     5
+
+struct termiox
+{
+        __u16   x_hflag;
+        __u16   x_cflag;
+        __u16   x_rflag[NFF];
+        __u16   x_sflag;
+};
+
+#define RTSXOFF         0x0001          /* RTS flow control on input */
+#define CTSXON          0x0002          /* CTS flow control on output */
+#define DTRXOFF         0x0004          /* DTR flow control on input */
+#define DSRXON          0x0008          /* DCD flow control on output */
+
+#endif