diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-17 11:13:38 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-17 11:13:38 -0500 |
commit | 69454e6991091d0d6eb7461653f2695d985e1a74 (patch) | |
tree | 4b67b8a5a306f3f24dfc8f7c8d2883a0423e98c3 /drivers | |
parent | a5222049f3e26c21ecd65bfcc9b666d4c813933b (diff) | |
parent | dc7bf130b8552a218e2f3ea0b58268e469f335da (diff) |
Merge master.kernel.org:/home/rmk/linux-2.6-serial
Diffstat (limited to 'drivers')
-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 b1fc97d5f643..244e8ff11977 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) | |||
2198 | touch_nmi_watchdog(); | 2198 | touch_nmi_watchdog(); |
2199 | 2199 | ||
2200 | /* | 2200 | /* |
2201 | * First save the UER then disable the interrupts | 2201 | * First save the IER then disable the interrupts |
2202 | */ | 2202 | */ |
2203 | ier = serial_in(up, UART_IER); | 2203 | ier = serial_in(up, UART_IER); |
2204 | 2204 | ||
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig index 0f4361c8466b..b3c561abe3f6 100644 --- a/drivers/serial/Kconfig +++ b/drivers/serial/Kconfig | |||
@@ -902,8 +902,8 @@ config SERIAL_JSM | |||
902 | something like this to connect more than two modems to your Linux | 902 | something like this to connect more than two modems to your Linux |
903 | box, for instance in order to become a dial-in server. This driver | 903 | box, for instance in order to become a dial-in server. This driver |
904 | supports PCI boards only. | 904 | supports PCI boards only. |
905 | If you have a card like this, say Y here and read the file | 905 | |
906 | <file:Documentation/jsm.txt>. | 906 | If you have a card like this, say Y here, otherwise say N. |
907 | 907 | ||
908 | To compile this driver as a module, choose M here: the | 908 | To compile this driver as a module, choose M here: the |
909 | module will be called jsm. | 909 | module will be called jsm. |