diff options
author | Paul Mackerras <paulus@samba.org> | 2007-11-02 14:03:14 +1100 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-11-02 14:03:14 +1100 |
commit | 97a4649d6ffce4a5d7f5ce018d87a6cefcb4ad03 (patch) | |
tree | 8f7f591754baa934a842357e75e773a525bfb147 /Documentation/kernel-parameters.txt | |
parent | [POWERPC] powerpc: Fix demotion of segments to 4K pages (diff) | |
parent | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
download | linux-dev-97a4649d6ffce4a5d7f5ce018d87a6cefcb4ad03.tar.xz linux-dev-97a4649d6ffce4a5d7f5ce018d87a6cefcb4ad03.zip |
Merge branch 'linux-2.6' into merge
Diffstat (limited to '')
-rw-r--r-- | Documentation/kernel-parameters.txt | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 8ae5fac08dfa..33121d6c827c 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -586,11 +586,6 @@ and is between 256 and 4096 characters. It is defined in the file eata= [HW,SCSI] - ec_intr= [HW,ACPI] ACPI Embedded Controller interrupt mode - Format: <int> - 0: polling mode - non-0: interrupt mode (default) - edd= [EDD] Format: {"of[f]" | "sk[ipmbr]"} See comment in arch/i386/boot/edd.S |