diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2011-06-17 16:32:26 +0200 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2011-06-17 16:32:26 +0200 |
commit | f8db4cc4f2b11bdded6c94f0d55906847474b982 (patch) | |
tree | d1b99d186edb9d203fafd896f19487125a2395af /Documentation | |
parent | spi/topcliff-pch: Support new device ML7223 IOH (diff) | |
parent | spi/bfin_spi: fix handling of default bits per word setting (diff) | |
download | linux-f8db4cc4f2b11bdded6c94f0d55906847474b982.tar.xz linux-f8db4cc4f2b11bdded6c94f0d55906847474b982.zip |
Merge branch 'spi/merge' into spi/next
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/kernel-parameters.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index d9a203b058f1..fd248a318211 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -2598,6 +2598,8 @@ bytes respectively. Such letter suffixes can also be entirely omitted. unlock ejectable media); m = MAX_SECTORS_64 (don't transfer more than 64 sectors = 32 KB at a time); + n = INITIAL_READ10 (force a retry of the + initial READ(10) command); o = CAPACITY_OK (accept the capacity reported by the device); r = IGNORE_RESIDUE (the device reports |