summaryrefslogtreecommitdiffstats
path: root/drivers/serial/Kconfig
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2007-10-20 04:26:44 +0000
committerSteve French <sfrench@us.ibm.com>2007-10-20 04:26:44 +0000
commit748c5151deb56e4b7b5a9b07a884243764933831 (patch)
treee9dd45b8806d00b56503cfa55c46f3ebce0d151c /drivers/serial/Kconfig
parent4879b44829d94a1f8facf90cced3c5f23c5a8c62 (diff)
parente8b8c977734193adedf2b0f607d6252c78e86394 (diff)
downloadtalos-obmc-linux-748c5151deb56e4b7b5a9b07a884243764933831.tar.gz
talos-obmc-linux-748c5151deb56e4b7b5a9b07a884243764933831.zip
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/serial/Kconfig')
-rw-r--r--drivers/serial/Kconfig6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index d6ae38e55d01..87665d7df6f2 100644
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -62,11 +62,11 @@ config SERIAL_8250_CONSOLE
kernel will automatically use the first serial line, /dev/ttyS0, as
system console.
- you can set that using a kernel command line option such as
+ You can set that using a kernel command line option such as
"console=uart8250,io,0x3f8,9600n8"
"console=uart8250,mmio,0xff5e0000,115200n8".
- and it will switch to normal serial console when correponding port is
- ready.
+ and it will switch to normal serial console when the corresponding
+ port is ready.
"earlycon=uart8250,io,0x3f8,9600n8"
"earlycon=uart8250,mmio,0xff5e0000,115200n8".
it will not only setup early console.
OpenPOWER on IntegriCloud