adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-31 21:26:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Linus Torvalds 2006-02-17 08:13:38 -08:00
commit 69454e6991
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/serial/8250.c
View file

@ -2198,7 +2198,7 @@ serial8250_console_write(struct console *co, const char *s, unsigned int count)
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);

4
drivers/serial/Kconfig
View file

@ -902,8 +902,8 @@ config SERIAL_JSM
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
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
module will be called jsm.