diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-02 01:06:15 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-02 01:06:15 -0500 |
| commit | 59ed2f59e4ea6a32f9591e378da7935f713a7000 (patch) | |
| tree | a1276a611dbb1bc44685ef8af363e99603e60047 /Documentation | |
| parent | 9ad11ab48b1ad618bf47076e9e579f267f5306c2 (diff) | |
| parent | b8e4d89357fc434618a59c1047cac72641191805 (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/kernel-parameters.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 1cbcf65b764b..84370363da80 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt | |||
| @@ -452,6 +452,11 @@ running once the system is up. | |||
| 452 | 452 | ||
| 453 | eata= [HW,SCSI] | 453 | eata= [HW,SCSI] |
| 454 | 454 | ||
| 455 | ec_intr= [HW,ACPI] ACPI Embedded Controller interrupt mode | ||
| 456 | Format: <int> | ||
| 457 | 0: polling mode | ||
| 458 | non-0: interrupt mode (default) | ||
| 459 | |||
| 455 | eda= [HW,PS2] | 460 | eda= [HW,PS2] |
| 456 | 461 | ||
| 457 | edb= [HW,PS2] | 462 | edb= [HW,PS2] |