diff options
author | Steve French <sfrench@us.ibm.com> | 2006-03-03 11:27:25 +0000 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2006-03-03 11:27:25 +0000 |
commit | c6ee60b7c8bbc78e3b1776b2820a7e7f95f8996a (patch) | |
tree | 99b48ef0f5217fddc0aa897d9e60d95ace7da6ff /Documentation/x86_64/boot-options.txt | |
parent | 13298defe5323c7fdcac268f588d8d1090758fb8 (diff) | |
parent | c499ec24c31edf270e777a868ffd0daddcfe7ebd (diff) | |
download | kernel_samsung_smdk4412-c6ee60b7c8bbc78e3b1776b2820a7e7f95f8996a.tar.gz kernel_samsung_smdk4412-c6ee60b7c8bbc78e3b1776b2820a7e7f95f8996a.tar.bz2 kernel_samsung_smdk4412-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.txt | 4 |
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 |