summaryrefslogtreecommitdiffstats
path: root/Documentation/x86_64/boot-options.txt
diff options
context:
space:
mode:
authorSteven Whitehouse <swhiteho@redhat.com>2006-02-27 13:27:34 -0500
committerSteven Whitehouse <swhiteho@redhat.com>2006-02-27 13:27:34 -0500
commitf3b270a47882b958e9e3c5bd86894e3a7072899a (patch)
treede3bdfd5d67e8310257b93ac3d8d703599b9d929 /Documentation/x86_64/boot-options.txt
parent116ad29d9839610d2811a1962cac7f3f2a9f9295 (diff)
parentb9a33cebac70d6f67a769ce8d4078fee2b254ada (diff)
downloadkernel-crypto-f3b270a47882b958e9e3c5bd86894e3a7072899a.tar.gz
kernel-crypto-f3b270a47882b958e9e3c5bd86894e3a7072899a.tar.xz
kernel-crypto-f3b270a47882b958e9e3c5bd86894e3a7072899a.zip
Merge branch 'master'
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 153740f460a..1921353259a 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