Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

parents a5222049 dc7bf130

drivers/serial/8250.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/serial/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -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.