From 301863cf4b0f742e397301d3269afebafa2d1b88 Mon Sep 17 00:00:00 2001 From: "Luiz Fernando N. Capitulino" Date: Thu, 28 Aug 2008 11:00:07 -0300 Subject: [PATCH] --- yaml --- r: 110403 b: refs/heads/master c: 1befdefcf476d5eb2fb4243fdf4d996a376708b1 h: refs/heads/master i: 110401: 743760e928b5b759ae2b8cb6e08b95489a864967 110399: d19ecfa462657ce830c2759a17da90950b2e4973 v: v3 --- [refs] | 2 +- trunk/Documentation/kernel-parameters.txt | 6 ------ trunk/Documentation/x86/x86_64/boot-options.txt | 4 ---- 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/[refs] b/[refs] index 9c631ca51458..921d9772474c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 59dfc3f8fbabb8681ab4f2fb2df795f9211f40f9 +refs/heads/master: 1befdefcf476d5eb2fb4243fdf4d996a376708b1 diff --git a/trunk/Documentation/kernel-parameters.txt b/trunk/Documentation/kernel-parameters.txt index a8976467a983..53b0a8f5b23b 100644 --- a/trunk/Documentation/kernel-parameters.txt +++ b/trunk/Documentation/kernel-parameters.txt @@ -463,12 +463,6 @@ and is between 256 and 4096 characters. It is defined in the file Range: 0 - 8192 Default: 64 - disable_8254_timer - enable_8254_timer - [IA32/X86_64] Disable/Enable interrupt 0 timer routing - over the 8254 in addition to over the IO-APIC. The - kernel tries to set a sensible default. - hpet= [X86-32,HPET] option to control HPET usage Format: { enable (default) | disable | force } disable: disable HPET and use PIT instead diff --git a/trunk/Documentation/x86/x86_64/boot-options.txt b/trunk/Documentation/x86/x86_64/boot-options.txt index b0c7b6c4abda..72ffb5373ec7 100644 --- a/trunk/Documentation/x86/x86_64/boot-options.txt +++ b/trunk/Documentation/x86/x86_64/boot-options.txt @@ -54,10 +54,6 @@ 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