Merge master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc

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

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index dd00fd556a60abad15662319d5c46fd0f166b26a..15e4fed127f69bd3200d2a8ae1e59832570def7e 100644 (file)
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -164,6 +164,10 @@ and is between 256 and 4096 characters. It is defined in the file
        acpi_skip_timer_override [HW,ACPI]
                        Recognize and ignore IRQ0/pin2 Interrupt Override.
                        For broken nForce2 BIOS resulting in XT-PIC timer.
+       acpi_use_timer_override [HW,ACPI}
+                       Use timer override. For some broken Nvidia NF5 boards
+                       that require a timer override, but don't have
+                       HPET
 
        acpi_dbg_layer= [HW,ACPI]
                        Format: <int>
@@ -553,9 +557,6 @@ and is between 256 and 4096 characters. It is defined in the file
        floppy=         [HW]
                        See Documentation/floppy.txt.
 
-       ftape=          [HW] Floppy Tape subsystem debugging options.
-                       See Documentation/ftape.txt.
-
        gamecon.map[2|3]=
                        [HW,JOY] Multisystem joystick and NES/SNES/PSX pad
                        support via parallel port (up to 5 devices per port)