diff options
author | Len Brown <len.brown@intel.com> | 2007-10-29 17:30:21 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2007-10-29 17:30:21 -0400 |
commit | 14f7d720bb6cc60be8931ea1a0f547dc1e475b88 (patch) | |
tree | df468cdc2d1556fdc24a023baeef4b5274baf702 /Documentation | |
parent | 6a22c57b8d2a62dea7280a6b2ac807a539ef0716 (diff) | |
parent | 5527c8bee27fa063dcec0e020fb8c242ba4270c2 (diff) |
Pull alexey-fixes into release branch
Diffstat (limited to 'Documentation')
-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 | |||
586 | 586 | ||
587 | eata= [HW,SCSI] | 587 | eata= [HW,SCSI] |
588 | 588 | ||
589 | ec_intr= [HW,ACPI] ACPI Embedded Controller interrupt mode | ||
590 | Format: <int> | ||
591 | 0: polling mode | ||
592 | non-0: interrupt mode (default) | ||
593 | |||
594 | edd= [EDD] | 589 | edd= [EDD] |
595 | Format: {"of[f]" | "sk[ipmbr]"} | 590 | Format: {"of[f]" | "sk[ipmbr]"} |
596 | See comment in arch/i386/boot/edd.S | 591 | See comment in arch/i386/boot/edd.S |