Merge branch 'timers/hpet' into timers/core

This commit is contained in:
Ingo Molnar
2009-03-26 15:45:45 +01:00
2 changed files with 67 additions and 17 deletions

View File

@@ -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: