diff options
| author | James Morris <jmorris@macbook.(none)> | 2009-12-03 01:33:40 -0500 |
|---|---|---|
| committer | James Morris <jmorris@macbook.(none)> | 2009-12-03 01:33:40 -0500 |
| commit | c84d6efd363a3948eb32ec40d46bab6338580454 (patch) | |
| tree | 3ba7ac46e6626fe8ac843834588609eb6ccee5c6 /Documentation/kernel-parameters.txt | |
| parent | 7539cf4b92be4aecc573ea962135f246a7a33401 (diff) | |
| parent | 22763c5cf3690a681551162c15d34d935308c8d7 (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'Documentation/kernel-parameters.txt')
| -rw-r--r-- | Documentation/kernel-parameters.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 5d386b4ff6a0..332fe3b47e0c 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt | |||
| @@ -670,6 +670,7 @@ and is between 256 and 4096 characters. It is defined in the file | |||
| 670 | earlyprintk= [X86,SH,BLACKFIN] | 670 | earlyprintk= [X86,SH,BLACKFIN] |
| 671 | earlyprintk=vga | 671 | earlyprintk=vga |
| 672 | earlyprintk=serial[,ttySn[,baudrate]] | 672 | earlyprintk=serial[,ttySn[,baudrate]] |
| 673 | earlyprintk=ttySn[,baudrate] | ||
| 673 | earlyprintk=dbgp[debugController#] | 674 | earlyprintk=dbgp[debugController#] |
| 674 | 675 | ||
| 675 | Append ",keep" to not disable it when the real console | 676 | Append ",keep" to not disable it when the real console |