summaryrefslogtreecommitdiffstats
path: root/Documentation/x86_64/boot-options.txt
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2006-03-03 12:27:25 +0100
committerSteve French <sfrench@us.ibm.com>2006-03-03 12:27:25 +0100
commitc6ee60b7c8bbc78e3b1776b2820a7e7f95f8996a (patch)
tree99b48ef0f5217fddc0aa897d9e60d95ace7da6ff /Documentation/x86_64/boot-options.txt
parent[CIFS] Upate cifs change log (diff)
parent[PATCH] reiserfs: do not check if unsigned < 0 (diff)
downloadlinux-c6ee60b7c8bbc78e3b1776b2820a7e7f95f8996a.tar.xz
linux-c6ee60b7c8bbc78e3b1776b2820a7e7f95f8996a.zip
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'Documentation/x86_64/boot-options.txt')
-rw-r--r--Documentation/x86_64/boot-options.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/x86_64/boot-options.txt b/Documentation/x86_64/boot-options.txt
index 153740f460a6..1921353259ae 100644
--- a/Documentation/x86_64/boot-options.txt
+++ b/Documentation/x86_64/boot-options.txt
@@ -52,6 +52,10 @@ APICs
apicmaintimer. Useful when your PIT timer is totally
broken.
+ disable_8254_timer / enable_8254_timer
+ Enable interrupt 0 timer routing over the 8254 in addition to over
+ the IO-APIC. The kernel tries to set a sensible default.
+
Early Console
syntax: earlyprintk=vga