aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/tty
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/tty')
-rw-r--r--drivers/tty/hvc/hvc_opal.c2
-rw-r--r--drivers/tty/hvc/hvc_vio.c2
-rw-r--r--drivers/tty/ipwireless/setup_protocol.h2
-rw-r--r--drivers/tty/serial/8250/Kconfig2
-rw-r--r--drivers/tty/serial/bfin_uart.c2
-rw-r--r--drivers/tty/serial/icom.c2
6 files changed, 6 insertions, 6 deletions
diff --git a/drivers/tty/hvc/hvc_opal.c b/drivers/tty/hvc/hvc_opal.c
index be1a9a1e749e..cd69b48f6dfd 100644
--- a/drivers/tty/hvc/hvc_opal.c
+++ b/drivers/tty/hvc/hvc_opal.c
@@ -178,7 +178,7 @@ static int hvc_opal_probe(struct platform_device *dev)
178 proto = HV_PROTOCOL_HVSI; 178 proto = HV_PROTOCOL_HVSI;
179 ops = &hvc_opal_hvsi_ops; 179 ops = &hvc_opal_hvsi_ops;
180 } else { 180 } else {
181 pr_err("hvc_opal: Unkown protocol for %s\n", 181 pr_err("hvc_opal: Unknown protocol for %s\n",
182 dev->dev.of_node->full_name); 182 dev->dev.of_node->full_name);
183 return -ENXIO; 183 return -ENXIO;
184 } 184 }
diff --git a/drivers/tty/hvc/hvc_vio.c b/drivers/tty/hvc/hvc_vio.c
index ed6f5f1f5a55..0c629807610e 100644
--- a/drivers/tty/hvc/hvc_vio.c
+++ b/drivers/tty/hvc/hvc_vio.c
@@ -313,7 +313,7 @@ static int hvc_vio_probe(struct vio_dev *vdev,
313 proto = HV_PROTOCOL_HVSI; 313 proto = HV_PROTOCOL_HVSI;
314 ops = &hvterm_hvsi_ops; 314 ops = &hvterm_hvsi_ops;
315 } else { 315 } else {
316 pr_err("hvc_vio: Unkown protocol for %s\n", vdev->dev.of_node->full_name); 316 pr_err("hvc_vio: Unknown protocol for %s\n", vdev->dev.of_node->full_name);
317 return -ENXIO; 317 return -ENXIO;
318 } 318 }
319 319
diff --git a/drivers/tty/ipwireless/setup_protocol.h b/drivers/tty/ipwireless/setup_protocol.h
index 9d6bcc77c73c..002c34e72521 100644
--- a/drivers/tty/ipwireless/setup_protocol.h
+++ b/drivers/tty/ipwireless/setup_protocol.h
@@ -59,7 +59,7 @@ struct tl_setup_config_done_msg {
59 unsigned char sig_no; /* TL_SETUP_SIGNO_CONFIG_DONE_MSG */ 59 unsigned char sig_no; /* TL_SETUP_SIGNO_CONFIG_DONE_MSG */
60} __attribute__ ((__packed__)); 60} __attribute__ ((__packed__));
61 61
62/* Asyncronous messages */ 62/* Asynchronous messages */
63struct tl_setup_open_msg { 63struct tl_setup_open_msg {
64 unsigned char sig_no; /* TL_SETUP_SIGNO_OPEN_MSG */ 64 unsigned char sig_no; /* TL_SETUP_SIGNO_OPEN_MSG */
65 unsigned char port_no; 65 unsigned char port_no;
diff --git a/drivers/tty/serial/8250/Kconfig b/drivers/tty/serial/8250/Kconfig
index f3d283f2e3aa..c31133a6ea8e 100644
--- a/drivers/tty/serial/8250/Kconfig
+++ b/drivers/tty/serial/8250/Kconfig
@@ -271,7 +271,7 @@ config SERIAL_8250_DW
271 present in the Synopsys DesignWare APB UART. 271 present in the Synopsys DesignWare APB UART.
272 272
273config SERIAL_8250_EM 273config SERIAL_8250_EM
274 tristate "Support for Emma Mobile intergrated serial port" 274 tristate "Support for Emma Mobile integrated serial port"
275 depends on SERIAL_8250 && ARM && HAVE_CLK 275 depends on SERIAL_8250 && ARM && HAVE_CLK
276 help 276 help
277 Selecting this option will add support for the integrated serial 277 Selecting this option will add support for the integrated serial
diff --git a/drivers/tty/serial/bfin_uart.c b/drivers/tty/serial/bfin_uart.c
index e6a008f4939f..2e2b2c1cb722 100644
--- a/drivers/tty/serial/bfin_uart.c
+++ b/drivers/tty/serial/bfin_uart.c
@@ -815,7 +815,7 @@ bfin_serial_set_termios(struct uart_port *port, struct ktermios *termios,
815 lcr = WLS(5); 815 lcr = WLS(5);
816 break; 816 break;
817 default: 817 default:
818 printk(KERN_ERR "%s: word lengh not supported\n", 818 printk(KERN_ERR "%s: word length not supported\n",
819 __func__); 819 __func__);
820 } 820 }
821 821
diff --git a/drivers/tty/serial/icom.c b/drivers/tty/serial/icom.c
index 6197a69adb4d..72b6334bcf1a 100644
--- a/drivers/tty/serial/icom.c
+++ b/drivers/tty/serial/icom.c
@@ -505,7 +505,7 @@ static void load_code(struct icom_port *icom_port)
505 /* Stop processor */ 505 /* Stop processor */
506 stop_processor(icom_port); 506 stop_processor(icom_port);
507 507
508 dev_err(&icom_port->adapter->pci_dev->dev,"Port not opertional\n"); 508 dev_err(&icom_port->adapter->pci_dev->dev,"Port not operational\n");
509 } 509 }
510 510
511 if (new_page != NULL) 511 if (new_page != NULL)