Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost

[sfrench/cifs-2.6.git] / Documentation / serial / serial-rs485.txt

diff --git a/Documentation/serial/serial-rs485.txt b/Documentation/serial/serial-rs485.txt
index 389fcd4759e9796bc55a5afd2faf158714151460..ce0c1a9b8aaba58cea4c80d37c911fa20a997fba 100644 (file)
--- a/Documentation/serial/serial-rs485.txt
+++ b/Documentation/serial/serial-rs485.txt
@@ -75,7 +75,7 @@
        /* Set rts delay after send, if needed: */
        rs485conf.delay_rts_after_send = ...;
 
-       /* Set this flag if you want to receive data even whilst sending data */
+       /* Set this flag if you want to receive data even while sending data */
        rs485conf.flags |= SER_RS485_RX_DURING_TX;
 
        if (ioctl (fd, TIOCSRS485, &rs485conf) < 0) {