Commit 69454e69 authored by Linus Torvalds's avatar Linus Torvalds

Merge master.kernel.org:/home/rmk/linux-2.6-serial

parents a5222049 dc7bf130
...@@ -2198,7 +2198,7 @@ serial8250_console_write(struct console *co, const char *s, unsigned int count) ...@@ -2198,7 +2198,7 @@ serial8250_console_write(struct console *co, const char *s, unsigned int count)
touch_nmi_watchdog(); touch_nmi_watchdog();
/* /*
* First save the UER then disable the interrupts * First save the IER then disable the interrupts
*/ */
ier = serial_in(up, UART_IER); ier = serial_in(up, UART_IER);
......
...@@ -902,8 +902,8 @@ config SERIAL_JSM ...@@ -902,8 +902,8 @@ config SERIAL_JSM
something like this to connect more than two modems to your Linux something like this to connect more than two modems to your Linux
box, for instance in order to become a dial-in server. This driver box, for instance in order to become a dial-in server. This driver
supports PCI boards only. supports PCI boards only.
If you have a card like this, say Y here and read the file
<file:Documentation/jsm.txt>. If you have a card like this, say Y here, otherwise say N.
To compile this driver as a module, choose M here: the To compile this driver as a module, choose M here: the
module will be called jsm. module will be called jsm.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment