diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-03-26 10:45:45 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-03-26 10:45:45 -0400 |
commit | e8684605adf87d8e65f64ce7b0274d60a05085bd (patch) | |
tree | 7d554f19d30839a8645e0c113c4f594ef53bbffa /Documentation/kernel-parameters.txt | |
parent | a5ebc0b1a7843508b375f7ab8a36a628e5c9f372 (diff) | |
parent | c23e253e67c9d8a91a0ffa33c1f571a17f0a2403 (diff) |
Merge branch 'timers/hpet' into timers/core
Diffstat (limited to 'Documentation/kernel-parameters.txt')
-rw-r--r-- | Documentation/kernel-parameters.txt | 4 |
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 | |||
492 | Default: 64 | 492 | Default: 64 |
493 | 493 | ||
494 | hpet= [X86-32,HPET] option to control HPET usage | 494 | hpet= [X86-32,HPET] option to control HPET usage |
495 | Format: { enable (default) | disable | force } | 495 | Format: { enable (default) | disable | force | |
496 | verbose } | ||
496 | disable: disable HPET and use PIT instead | 497 | disable: disable HPET and use PIT instead |
497 | force: allow force enabled of undocumented chips (ICH4, | 498 | force: allow force enabled of undocumented chips (ICH4, |
498 | VIA, nVidia) | 499 | VIA, nVidia) |
500 | verbose: show contents of HPET registers during setup | ||
499 | 501 | ||
500 | com20020= [HW,NET] ARCnet - COM20020 chipset | 502 | com20020= [HW,NET] ARCnet - COM20020 chipset |
501 | Format: | 503 | Format: |