diff options
author | John W. Linville <linville@tuxdriver.com> | 2006-06-05 18:42:27 (GMT) |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2006-06-05 18:42:27 (GMT) |
commit | dea58b80f2625d3712645fb6ff0af45866cedaae (patch) | |
tree | b9c0d4f7d4fcd90e438b5cc5d05471e52615a62d /Documentation | |
parent | b1141f6d5dead296adcabd4a1e8ea2b994e287cb (diff) | |
parent | 672c6108a51bf559d19595d9f8193dfd81f0f752 (diff) | |
download | linux-fsl-qoriq-dea58b80f2625d3712645fb6ff0af45866cedaae.tar.xz |
Merge branch 'from-linus' into upstream
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/serial/driver | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Documentation/serial/driver b/Documentation/serial/driver index df82116..88ad615 100644 --- a/Documentation/serial/driver +++ b/Documentation/serial/driver @@ -214,12 +214,13 @@ hardware. The interaction of the iflag bits is as follows (parity error given as an example): Parity error INPCK IGNPAR - None n/a n/a character received - Yes n/a 0 character discarded - Yes 0 1 character received, marked as + n/a 0 n/a character received, marked as TTY_NORMAL - Yes 1 1 character received, marked as + None 1 n/a character received, marked as + TTY_NORMAL + Yes 1 0 character received, marked as TTY_PARITY + Yes 1 1 character discarded Other flags may be used (eg, xon/xoff characters) if your hardware supports hardware "soft" flow control. |