From 347165231ca585ebe68d8ad6cf876397b6a9bff8 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Tue, 3 Jul 2007 01:28:49 -0400 Subject: [PATCH] --- yaml --- r: 62525 b: refs/heads/master c: 1c1558ec50618c4a179e0684037d9f7bb0c1a326 h: refs/heads/master i: 62523: e64682ef654f62684dca8ae93c87ea27ec529731 v: v3 --- [refs] | 2 +- trunk/Documentation/kernel-parameters.txt | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 9996ec0e991c..47fdf2ca9b94 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e4d49531dcc2f334205d99614164ea900216b1cb +refs/heads/master: 1c1558ec50618c4a179e0684037d9f7bb0c1a326 diff --git a/trunk/Documentation/kernel-parameters.txt b/trunk/Documentation/kernel-parameters.txt index ce91560229f5..7ce5ea949d1a 100644 --- a/trunk/Documentation/kernel-parameters.txt +++ b/trunk/Documentation/kernel-parameters.txt @@ -220,11 +220,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