Auto-update from upstream

[sfrench/cifs-2.6.git] / Documentation / kernel-parameters.txt

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 971589a9752dc36585facd3fc6e40570f6e0a2ae..06e362b2d5b8bb7321cac022685bba04e9c81da7 100644 (file)
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -633,6 +633,14 @@ running once the system is up.
        inport.irq=     [HW] Inport (ATI XL and Microsoft) busmouse driver
                        Format: <irq>
 
+       combined_mode=  [HW] control which driver uses IDE ports in combined
+                       mode: legacy IDE driver, libata, or both
+                       (in the libata case, libata.atapi_enabled=1 may be
+                       useful as well).  Note that using the ide or libata
+                       options may affect your device naming (e.g. by
+                       changing hdc to sdb).
+                       Format: combined (default), ide, or libata
+
        inttest=        [IA64]
 
        io7=            [HW] IO7 for Marvel based alpha systems
@@ -1160,6 +1168,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.
@@ -1460,8 +1472,6 @@ running once the system is up.
        stifb=          [HW]
                        Format: bpp:<bpp1>[:<bpp2>[:<bpp3>...]]
 
-       stram_swap=     [HW,M68k]
-
        swiotlb=        [IA-64] Number of I/O TLB slabs
 
        switches=       [HW,M68k]
@@ -1517,8 +1527,6 @@ running once the system is up.
        uart6850=       [HW,OSS]
                        Format: <io>,<irq>
 
-       usb-handoff     [HW] Enable early USB BIOS -> OS handoff
-
        usbhid.mousepoll=
                        [USBHID] The interval which mice are to be polled at.