summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2018-03-06 07:31:14 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2018-03-06 07:31:14 +0300
commitce380619fab99036f5e745c7a865b21c59f005f6 (patch)
tree04c32364dabb8917c3beeb740357b4c0d0232792 /Documentation
parent094b58e1040a44f991d7ab628035e69c4d6b79c9 (diff)
parent48e362dd96f37d819042f848888b2c6407e01e6d (diff)
downloadlinux-ce380619fab99036f5e745c7a865b21c59f005f6.tar.xz
Merge tag 'please-pull-ia64_misc' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux
Pull ia64 cleanups from Tony Luck: - More atomic cleanup from willy - Fix a python script to work with version 3 - Some other small cleanups * tag 'please-pull-ia64_misc' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux: ia64/err-inject: fix spelling mistake: "capapbilities" -> "capabilities" ia64/err-inject: Use get_user_pages_fast() ia64: doc: tweak whitespace for 'console=' parameter ia64: Convert remaining atomic operations ia64: convert unwcheck.py to python3
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/ia64/serial.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/ia64/serial.txt b/Documentation/ia64/serial.txt
index 6869c73de4e2..a63d2c54329b 100644
--- a/Documentation/ia64/serial.txt
+++ b/Documentation/ia64/serial.txt
@@ -111,7 +111,7 @@ TROUBLESHOOTING SERIAL CONSOLE PROBLEMS
- If you don't have an HCDP, the kernel doesn't know where
your console lives until the driver discovers serial
- devices. Use "console=uart, io,0x3f8" (or appropriate
+ devices. Use "console=uart,io,0x3f8" (or appropriate
address for your machine).
Kernel and init script output works fine, but no "login:" prompt: