diff options
| author | Len Brown <len.brown@intel.com> | 2007-03-09 23:19:50 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-03-09 23:19:50 -0500 |
| commit | 63e34ca93a62f472144db60fa3b81111c0d15721 (patch) | |
| tree | 2137a4b98360833e78cbb8edd5dce5b2ab5a0a60 /Documentation | |
| parent | 51e7fff1c2b763da910db3a875eac5b992df91d9 (diff) | |
| parent | 9327f46ee28116b17f15f6505edd90f905908d62 (diff) | |
Pull misc-for-upstream into release branch
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/kernel-parameters.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 914119309ddb..856c8b114e71 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt | |||
| @@ -126,7 +126,8 @@ and is between 256 and 4096 characters. It is defined in the file | |||
| 126 | See header of drivers/scsi/53c7xx.c. | 126 | See header of drivers/scsi/53c7xx.c. |
| 127 | See also Documentation/scsi/ncr53c7xx.txt. | 127 | See also Documentation/scsi/ncr53c7xx.txt. |
| 128 | 128 | ||
| 129 | acpi= [HW,ACPI] Advanced Configuration and Power Interface | 129 | acpi= [HW,ACPI,X86-64,i386] |
| 130 | Advanced Configuration and Power Interface | ||
| 130 | Format: { force | off | ht | strict | noirq } | 131 | Format: { force | off | ht | strict | noirq } |
| 131 | force -- enable ACPI if default was off | 132 | force -- enable ACPI if default was off |
| 132 | off -- disable ACPI if default was on | 133 | off -- disable ACPI if default was on |