summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-04-22 19:46:29 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-04-22 19:46:29 -0700
commitd5a30458a90597915977f06e79406b664a41b8ac (patch)
tree377cf40e56f3503b031a40ac242a9368cf2cfb20 /Documentation
parenta4b7d3bb744bbaaceb94a9aaf6b5cbc6e5d230f0 (diff)
parenta09bf4cd53b8ab000197ef81f15d50f29ecf973c (diff)
downloadop-kernel-dev-d5a30458a90597915977f06e79406b664a41b8ac.zip
op-kernel-dev-d5a30458a90597915977f06e79406b664a41b8ac.tar.gz
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev: libata: ensure NCQ error result taskfile is fully initialized before returning it via qc->result_tf. libata: fix docs, RE port and device of libata.force ID separated by point pata_pcmcia/ide-cs: add IDs for transcend and kingston cards libata: fix locking around blk_abort_request()
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/kernel-parameters.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index e2202e9..839b21b 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -1194,7 +1194,7 @@ and is between 256 and 4096 characters. It is defined in the file
libata.force= [LIBATA] Force configurations. The format is comma
separated list of "[ID:]VAL" where ID is
- PORT[:DEVICE]. PORT and DEVICE are decimal numbers
+ PORT[.DEVICE]. PORT and DEVICE are decimal numbers
matching port, link or device. Basically, it matches
the ATA ID string printed on console by libata. If
the whole ID part is omitted, the last PORT and DEVICE
OpenPOWER on IntegriCloud