aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/serial
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
parent6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff)
parent6070d81eb5f2d4943223c96e7609a53cdc984364 (diff)
Merge branch 'for-next' into for-linus
Conflicts: kernel/irq/chip.c
Diffstat (limited to 'drivers/serial')
-rw-r--r--drivers/serial/8250_pnp.c4
-rw-r--r--drivers/serial/pmac_zilog.h2
-rw-r--r--drivers/serial/ucc_uart.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/serial/8250_pnp.c b/drivers/serial/8250_pnp.c
index d71dfe398940..36ede02ceacf 100644
--- a/drivers/serial/8250_pnp.c
+++ b/drivers/serial/8250_pnp.c
@@ -361,9 +361,9 @@ static const struct pnp_device_id pnp_dev_table[] = {
361 { "LTS0001", 0 }, 361 { "LTS0001", 0 },
362 /* Rockwell's (PORALiNK) 33600 INT PNP */ 362 /* Rockwell's (PORALiNK) 33600 INT PNP */
363 { "WCI0003", 0 }, 363 { "WCI0003", 0 },
364 /* Unkown PnP modems */ 364 /* Unknown PnP modems */
365 { "PNPCXXX", UNKNOWN_DEV }, 365 { "PNPCXXX", UNKNOWN_DEV },
366 /* More unkown PnP modems */ 366 /* More unknown PnP modems */
367 { "PNPDXXX", UNKNOWN_DEV }, 367 { "PNPDXXX", UNKNOWN_DEV },
368 { "", 0 } 368 { "", 0 }
369}; 369};
diff --git a/drivers/serial/pmac_zilog.h b/drivers/serial/pmac_zilog.h
index 570b0d925e83..f6e77f12acd5 100644
--- a/drivers/serial/pmac_zilog.h
+++ b/drivers/serial/pmac_zilog.h
@@ -73,7 +73,7 @@ static inline struct uart_pmac_port *pmz_get_port_A(struct uart_pmac_port *uap)
73} 73}
74 74
75/* 75/*
76 * Register acessors. Note that we don't need to enforce a recovery 76 * Register accessors. Note that we don't need to enforce a recovery
77 * delay on PCI PowerMac hardware, it's dealt in HW by the MacIO chip, 77 * delay on PCI PowerMac hardware, it's dealt in HW by the MacIO chip,
78 * though if we try to use this driver on older machines, we might have 78 * though if we try to use this driver on older machines, we might have
79 * to add it back 79 * to add it back
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