diff options
| author | Len Brown <len.brown@intel.com> | 2005-08-15 21:49:00 +0200 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-08-15 21:49:00 +0200 |
| commit | b857c730d4e960d1876ff56ce5c4bd81ea9ff5ae (patch) | |
| tree | bce3d877276819174962796954c424c0a09be188 /Documentation/kernel-parameters.txt | |
| parent | Revert PCIBIOS_MIN_IO changes for 2.6.13 (diff) | |
| parent | [ACPI] re-enable platform-specific hotkey drivers by default (diff) | |
| download | linux-b857c730d4e960d1876ff56ce5c4bd81ea9ff5ae.tar.xz linux-b857c730d4e960d1876ff56ce5c4bd81ea9ff5ae.zip | |
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. acpi_fake_ecdt [HW,ACPI] Workaround failure due to BIOS lacking ECDT + acpi_generic_hotkey [HW,ACPI] + Allow consolidated generic hotkey driver to + over-ride platform specific driver. + See also Documentation/acpi-hotkey.txt. + ad1816= [HW,OSS] Format: <io>,<irq>,<dma>,<dma2> See also Documentation/sound/oss/AD1816. |