diff options
author | Paul Mackerras <paulus@samba.org> | 2006-02-28 00:35:24 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-02-28 00:35:24 -0500 |
commit | 6749c5507388f3fc3719f57a54b540ee83f6661a (patch) | |
tree | c069f990f86b020a14b50759d0c75475eedde186 /Documentation/x86_64 | |
parent | 2cf82c0256b198ae28c465f2c4d7c12c836ea5ea (diff) | |
parent | 56ec6462af9cba56a04439154e5768672d6f390f (diff) |
Merge ../powerpc-merge
Diffstat (limited to 'Documentation/x86_64')
-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 153740f460a6..1921353259ae 100644 --- a/Documentation/x86_64/boot-options.txt +++ b/Documentation/x86_64/boot-options.txt | |||
@@ -52,6 +52,10 @@ APICs | |||
52 | apicmaintimer. Useful when your PIT timer is totally | 52 | apicmaintimer. Useful when your PIT timer is totally |
53 | broken. | 53 | broken. |
54 | 54 | ||
55 | disable_8254_timer / enable_8254_timer | ||
56 | Enable interrupt 0 timer routing over the 8254 in addition to over | ||
57 | the IO-APIC. The kernel tries to set a sensible default. | ||
58 | |||
55 | Early Console | 59 | Early Console |
56 | 60 | ||
57 | syntax: earlyprintk=vga | 61 | syntax: earlyprintk=vga |