summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-03-26 15:45:45 +0100
committerIngo Molnar <mingo@elte.hu>2009-03-26 15:45:45 +0100
commite8684605adf87d8e65f64ce7b0274d60a05085bd (patch)
tree7d554f19d30839a8645e0c113c4f594ef53bbffa /Documentation
parenta5ebc0b1a7843508b375f7ab8a36a628e5c9f372 (diff)
parentc23e253e67c9d8a91a0ffa33c1f571a17f0a2403 (diff)
Merge branch 'timers/hpet' into timers/core
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/kernel-parameters.txt4
1 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 54f21a5c262..46d11a95236 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: