diff options
| author | Len Brown <len.brown@intel.com> | 2005-08-15 15:49:00 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-08-15 15:49:00 -0400 |
| commit | b857c730d4e960d1876ff56ce5c4bd81ea9ff5ae (patch) | |
| tree | bce3d877276819174962796954c424c0a09be188 /Documentation/kernel-parameters.txt | |
| parent | 2ba84684e8cf6f980e4e95a2300f53a505eb794e (diff) | |
| parent | 30e332f3307e9f7718490a706e5ce99f0d3a7b26 (diff) | |
Merge ../to-linus-stable/
Diffstat (limited to 'Documentation/kernel-parameters.txt')
| -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 a998a8c2f95b..3d5cd7a09b2f 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt | |||
| @@ -159,6 +159,11 @@ running once the system is up. | |||
| 159 | 159 | ||
| 160 | acpi_fake_ecdt [HW,ACPI] Workaround failure due to BIOS lacking ECDT | 160 | acpi_fake_ecdt [HW,ACPI] Workaround failure due to BIOS lacking ECDT |
| 161 | 161 | ||
| 162 | acpi_generic_hotkey [HW,ACPI] | ||
| 163 | Allow consolidated generic hotkey driver to | ||
| 164 | over-ride platform specific driver. | ||
| 165 | See also Documentation/acpi-hotkey.txt. | ||
| 166 | |||
| 162 | ad1816= [HW,OSS] | 167 | ad1816= [HW,OSS] |
| 163 | Format: <io>,<irq>,<dma>,<dma2> | 168 | Format: <io>,<irq>,<dma>,<dma2> |
| 164 | See also Documentation/sound/oss/AD1816. | 169 | See also Documentation/sound/oss/AD1816. |