Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6] / Documentation / kernel-parameters.txt

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index a482fde09bbbe01756627bffb4ce3cd98ebbeed5..0dc848bf0b56bb59b0c69eacfc3fb4d6a593fb7c 100644 (file)
--- 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>
 
@@ -1176,6 +1178,10 @@ running once the system is up.
                        Limit processor to maximum C-state
                        max_cstate=9 overrides any DMI blacklist limit.
 
+       processor.nocst [HW,ACPI]
+                       Ignore the _CST method to determine C-states,
+                       instead using the legacy FADT method
+
        prompt_ramdisk= [RAM] List of RAM disks to prompt for floppy disk
                        before loading.
                        See Documentation/ramdisk.txt.