diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 15:09:03 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 15:09:03 -0800 |
| commit | 05814450070f13b671fc9dbf89477677aa0258cb (patch) | |
| tree | 4c7f6e85c59a79d0e5835cbca69de5642071a833 /Documentation | |
| parent | 8e9c238c3884c226f0cddc31cde87dd5df1a6500 (diff) | |
| parent | a61c2d78ce61e67baf27c43f6721db87a27ac762 (diff) | |
| download | kernel-common-05814450070f13b671fc9dbf89477677aa0258cb.tar.gz kernel-common-05814450070f13b671fc9dbf89477677aa0258cb.tar.bz2 kernel-common-05814450070f13b671fc9dbf89477677aa0258cb.zip | |
Merge master.kernel.org:/home/rmk/linux-2.6-serial
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 acb010bb087b..0dc848bf0b56 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -998,6 +998,8 @@ running once the system is up. nowb [ARM] + nr_uarts= [SERIAL] maximum number of UARTs to be registered. + opl3= [HW,OSS] Format: <io> |