diff options
author | Ingo Molnar <mingo@elte.hu> | 2010-05-13 08:11:26 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2010-05-13 08:11:29 +0200 |
commit | ad56b0797e67df5e04b2f1a1e02900145c5c16f2 (patch) | |
tree | 1569bed80a4de531afb88cac9d60ef8bd0aa89f2 /Documentation/kernel-parameters.txt | |
parent | 668eb65f092902eb7dd526af73d4a7f025a94612 (diff) | |
parent | b57f95a38233a2e73b679bea4a5453a1cc2a1cc9 (diff) | |
download | linux-ad56b0797e67df5e04b2f1a1e02900145c5c16f2.tar.bz2 |
Merge commit 'v2.6.34-rc7' into tracing/core
Merge reason: Update from -rc5 to -rc7.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'Documentation/kernel-parameters.txt')
-rw-r--r-- | Documentation/kernel-parameters.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 21a99474df93..907010cea9ad 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -1198,7 +1198,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 |