Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 343018
b: refs/heads/master
c: 46e99c4
h: refs/heads/master
v: v3
  • Loading branch information
Masanari Iida authored and Jiri Kosina committed Oct 25, 2012
1 parent 9cea79b commit 48ab1a8
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: fc0d1b93fe7b331448631c723cb19668c9027bf4
refs/heads/master: 46e99c4a1d57dc73e518466bb3a8da9e7094415e
2 changes: 1 addition & 1 deletion trunk/drivers/tty/hvc/hvc_opal.c
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ static int __devinit hvc_opal_probe(struct platform_device *dev)
proto = HV_PROTOCOL_HVSI;
ops = &hvc_opal_hvsi_ops;
} else {
pr_err("hvc_opal: Unkown protocol for %s\n",
pr_err("hvc_opal: Unknown protocol for %s\n",
dev->dev.of_node->full_name);
return -ENXIO;
}
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/tty/hvc/hvc_vio.c
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ static int __devinit hvc_vio_probe(struct vio_dev *vdev,
proto = HV_PROTOCOL_HVSI;
ops = &hvterm_hvsi_ops;
} else {
pr_err("hvc_vio: Unkown protocol for %s\n", vdev->dev.of_node->full_name);
pr_err("hvc_vio: Unknown protocol for %s\n", vdev->dev.of_node->full_name);
return -ENXIO;
}

Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/tty/serial/8250/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ config SERIAL_8250_DW
present in the Synopsys DesignWare APB UART.

config SERIAL_8250_EM
tristate "Support for Emma Mobile intergrated serial port"
tristate "Support for Emma Mobile integrated serial port"
depends on SERIAL_8250 && ARM && HAVE_CLK
help
Selecting this option will add support for the integrated serial
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/tty/serial/bfin_uart.c
Original file line number Diff line number Diff line change
Expand Up @@ -815,7 +815,7 @@ bfin_serial_set_termios(struct uart_port *port, struct ktermios *termios,
lcr = WLS(5);
break;
default:
printk(KERN_ERR "%s: word lengh not supported\n",
printk(KERN_ERR "%s: word length not supported\n",
__func__);
}

Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/tty/serial/icom.c
Original file line number Diff line number Diff line change
Expand Up @@ -505,7 +505,7 @@ static void load_code(struct icom_port *icom_port)
/* Stop processor */
stop_processor(icom_port);

dev_err(&icom_port->adapter->pci_dev->dev,"Port not opertional\n");
dev_err(&icom_port->adapter->pci_dev->dev,"Port not operational\n");
}

if (new_page != NULL)
Expand Down

0 comments on commit 48ab1a8

Please sign in to comment.