aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-07-15 13:39:57 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-07-15 13:39:57 -0400
commitda6e88f4963385b1b649b043691d206fbb951913 (patch)
tree779a1a6cf04dad09dee0828ad4ece0927de1b5f3 /Documentation
parent61d97f4fcf73d30864a52373a34093be25be6a03 (diff)
parent7dc9719682ce8c46215bc9a1bdc7ee0c38ada94b (diff)
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.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 681d6152e003..4720f8ca211a 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
1612 Format: { parport<nr> | timid | 0 } 1612 Format: { parport<nr> | timid | 0 }
1613 See also Documentation/parport.txt. 1613 See also Documentation/parport.txt.
1614 1614
1615 pmtmr= [X86] Manual setup of pmtmr I/O Port.
1616 Override pmtimer IOPort with a hex value.
1617 e.g. pmtmr=0x508
1618
1615 pnpacpi= [ACPI] 1619 pnpacpi= [ACPI]
1616 { off } 1620 { off }
1617 1621