diff options
| author | Dave Kleikamp <shaggy@austin.ibm.com> | 2005-08-19 10:37:59 -0500 |
|---|---|---|
| committer | Dave Kleikamp <shaggy@austin.ibm.com> | 2005-08-19 10:37:59 -0500 |
| commit | 01fa90cb2f0b664bc86d9aff807f4ea7f09e2e7f (patch) | |
| tree | 5c290dcd84389e8a5bacc052bf61ea89ac02a4fb /Documentation/kernel-parameters.txt | |
| parent | 686762c8049457a6255ad5caf9275c100fbaceb6 (diff) | |
| parent | 2ad56496627630ebc99f06af5f81ca23e17e014e (diff) | |
Merge with /home/shaggy/git/linus-clean/
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 a998a8c2f95..3d5cd7a09b2 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. |