diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-15 10:39:57 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-15 10:39:57 -0700 |
| commit | da6e88f4963385b1b649b043691d206fbb951913 (patch) | |
| tree | 779a1a6cf04dad09dee0828ad4ece0927de1b5f3 /Documentation | |
| parent | 61d97f4fcf73d30864a52373a34093be25be6a03 (diff) | |
| parent | 7dc9719682ce8c46215bc9a1bdc7ee0c38ada94b (diff) | |
| download | op-kernel-dev-da6e88f4963385b1b649b043691d206fbb951913.zip op-kernel-dev-da6e88f4963385b1b649b043691d206fbb951913.tar.gz | |
Merge branch 'timers/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'timers/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: add PCI ID for 6300ESB force hpet
x86: add another PCI ID for ICH6 force-hpet
kernel-paramaters: document pmtmr= command line option
acpi_pm clccksource: fix printk format warning
nohz: don't stop idle tick if softirqs are pending.
pmtmr: allow command line override of ioport
nohz: reduce jiffies polling overhead
hrtimer: Remove unused variables in ktime_divns()
hrtimer: remove warning in hres_timers_resume
posix-timers: print RT watchdog message
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/kernel-parameters.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 681d615..4720f8c 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -1612,6 +1612,10 @@ and is between 256 and 4096 characters. It is defined in the file Format: { parport<nr> | timid | 0 } See also Documentation/parport.txt. + pmtmr= [X86] Manual setup of pmtmr I/O Port. + Override pmtimer IOPort with a hex value. + e.g. pmtmr=0x508 + pnpacpi= [ACPI] { off } |
