From edc6fdc667e9476a2c7a0e036968a61c5e3991c6 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Tue, 26 Jun 2007 22:03:04 -0400 Subject: [PATCH] --- yaml --- r: 58052 b: refs/heads/master c: 67a32be082035bfc126849df38a8772a96f3e5c0 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/Documentation/kernel-parameters.txt | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 2903340f1bcb..e5e8fa73e928 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ad5c980fdef0f339eb7c5888525acf9ce33855ec +refs/heads/master: 67a32be082035bfc126849df38a8772a96f3e5c0 diff --git a/trunk/Documentation/kernel-parameters.txt b/trunk/Documentation/kernel-parameters.txt index 5d0283cd3a81..af50f9bbe68e 100644 --- a/trunk/Documentation/kernel-parameters.txt +++ b/trunk/Documentation/kernel-parameters.txt @@ -223,11 +223,6 @@ and is between 256 and 4096 characters. It is defined in the file acpi_fake_ecdt [HW,ACPI] Workaround failure due to BIOS lacking ECDT - acpi_generic_hotkey [HW,ACPI] - Allow consolidated generic hotkey driver to - override platform specific driver. - See also Documentation/acpi-hotkey.txt. - acpi_pm_good [IA-32,X86-64] Override the pmtimer bug detection: force the kernel to assume that this machine's pmtimer latches its value