Merge branch 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[pandora-kernel.git] / Documentation / kernel-parameters.txt

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 954b23c..fa4e123 100644 (file)
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -493,10 +493,12 @@ and is between 256 and 4096 characters. It is defined in the file
                        Default: 64
 
        hpet=           [X86-32,HPET] option to control HPET usage
                        Default: 64
 
        hpet=           [X86-32,HPET] option to control HPET usage

-                       Format: { enable (default) | disable | force }
+                       Format: { enable (default) | disable | force |
+                               verbose }

                        disable: disable HPET and use PIT instead
                        force: allow force enabled of undocumented chips (ICH4,
                        VIA, nVidia)
                        disable: disable HPET and use PIT instead
                        force: allow force enabled of undocumented chips (ICH4,
                        VIA, nVidia)

+                       verbose: show contents of HPET registers during setup

 
        com20020=       [HW,NET] ARCnet - COM20020 chipset
                        Format:
 
        com20020=       [HW,NET] ARCnet - COM20020 chipset
                        Format: