aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/serial/ucc_uart.c
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2009-12-07 12:36:35 -0500
committerJiri Kosina <jkosina@suse.cz>2009-12-07 12:36:35 -0500
commitd014d043869cdc591f3a33243d3481fa4479c2d0 (patch)
tree63626829498e647ba058a1ce06419fe7e4d5f97d /drivers/serial/ucc_uart.c
parent6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff)
parent6070d81eb5f2d4943223c96e7609a53cdc984364 (diff)
Merge branch 'for-next' into for-linus
Conflicts: kernel/irq/chip.c
Diffstat (limited to 'drivers/serial/ucc_uart.c')
-rw-r--r--drivers/serial/ucc_uart.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/serial/ucc_uart.c b/drivers/serial/ucc_uart.c
index 0c08f286a2ef..46de564aaea0 100644
--- a/drivers/serial/ucc_uart.c
+++ b/drivers/serial/ucc_uart.c
@@ -313,7 +313,7 @@ static void qe_uart_stop_tx(struct uart_port *port)
313 * This function will attempt to stuff of all the characters from the 313 * This function will attempt to stuff of all the characters from the
314 * kernel's transmit buffer into TX BDs. 314 * kernel's transmit buffer into TX BDs.
315 * 315 *
316 * A return value of non-zero indicates that it sucessfully stuffed all 316 * A return value of non-zero indicates that it successfully stuffed all
317 * characters from the kernel buffer. 317 * characters from the kernel buffer.
318 * 318 *
319 * A return value of zero indicates that there are still characters in the 319 * A return value of zero indicates that there are still characters in the