path: root/drivers
diff options
authorLinus Torvalds <torvalds@g5.osdl.org>2006-02-17 08:13:38 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-02-17 08:13:38 -0800
commit69454e6991091d0d6eb7461653f2695d985e1a74 (patch)
tree4b67b8a5a306f3f24dfc8f7c8d2883a0423e98c3 /drivers
parentMerge master.kernel.org:/home/rmk/linux-2.6-arm (diff)
parent[SERIAL] Fix typo in comment (diff)
Merge master.kernel.org:/home/rmk/linux-2.6-serial
Diffstat (limited to 'drivers')
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)
- * 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 0f4361c8466b..b3c561abe3f6 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.