x86: HPET force enable o ICH7 and later

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

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index a57c1f2..f27cdd7 100644 (file)
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -1009,6 +1009,10 @@ and is between 256 and 4096 characters. It is defined in the file
        meye.*=         [HW] Set MotionEye Camera parameters
                        See Documentation/video4linux/meye.txt.
 
+       mfgpt_irq=      [IA-32] Specify the IRQ to use for the
+                       Multi-Function General Purpose Timers on AMD Geode
+                       platforms.
+
        mga=            [HW,DRM]
 
        mousedev.tap_time=
@@ -1160,6 +1164,9 @@ and is between 256 and 4096 characters. It is defined in the file
 
        nomce           [X86-32] Machine Check Exception
 
+       nomfgpt         [X86-32] Disable Multi-Function General Purpose
+                       Timer usage (for AMD Geode machines).
+
        noreplace-paravirt      [X86-32,PV_OPS] Don't patch paravirt_ops
 
        noreplace-smp   [X86-32,SMP] Don't replace SMP instructions