diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-02-20 02:16:23 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-20 02:16:23 -0500 |
| commit | 5b2ffed906a3ebd4e52a5bbef06b99a517c53e4b (patch) | |
| tree | 2f900f89d93db6b0822d8bdf4f49851c581c12a6 /drivers/serial | |
| parent | f1b318793dcd2d9ff6b5ac06e7762098fa079cee (diff) | |
| parent | bd71c2b17468a2531fb4c81ec1d73520845e97e1 (diff) | |
| download | kernel-crypto-5b2ffed906a3ebd4e52a5bbef06b99a517c53e4b.tar.gz kernel-crypto-5b2ffed906a3ebd4e52a5bbef06b99a517c53e4b.tar.xz kernel-crypto-5b2ffed906a3ebd4e52a5bbef06b99a517c53e4b.zip | |
Merge branch 'master'
Diffstat (limited to 'drivers/serial')
| -rw-r--r-- | drivers/serial/8250.c | 2 | ||||
| -rw-r--r-- | drivers/serial/Kconfig | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c index b1fc97d5f64..244e8ff1197 100644 --- a/drivers/serial/8250.c +++ b/drivers/serial/8250.c @@ -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); diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig index 0f4361c8466..b3c561abe3f 100644 --- a/drivers/serial/Kconfig +++ b/drivers/serial/Kconfig @@ -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. |