Merge branch 'timers/hpet' into timers/core

1 files changed, 3 insertions, 1 deletions

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 54f21a5c262b..46d11a95236e 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -492,10 +492,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
-                        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)
+                        verbose: show contents of HPET registers during setup
 
         com20020=       [HW,NET] ARCnet - COM20020 chipset
                         Format: